No OneTemporary

File Metadata

Created
Sat, May 4, 5:41 AM
This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd1013320..c29e4fa48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,416 +1,420 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_policy(SET CMP0043 NEW)
project(gcompris-qt C CXX)
# get all the redist dll needed for windows when compiling with vc
set(CMAKE_INSTALL_UCRT_LIBRARIES 1)
include(InstallRequiredSystemLibraries)
# Set c++11 support
include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
+check_cxx_compiler_flag("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
if(COMPILER_SUPPORTS_CXX11)
- set(my_cxx_flags "-std=c++11")
+ set(my_cxx_flags "-std=c++11")
elseif(COMPILER_SUPPORTS_CXX0X)
- set(my_cxx_flags "-std=c++0x")
+ set(my_cxx_flags "-std=c++0x")
else()
- message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+ message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${my_cxx_flags}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${my_cxx_flags}")
# enable qml debugging for DEBUG builds:
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_QML_DEBUG")
set(GCOMPRIS_MAJOR_VERSION 0)
-set(GCOMPRIS_MINOR_VERSION 98)
+set(GCOMPRIS_MINOR_VERSION 97)
set(GCOMPRIS_PATCH_VERSION 0)
+if("${ANDROID_ARCH}" STREQUAL "arm64")
+ set(GCOMPRIS_PATCH_VERSION 1)
+endif()
+
# Set the BUILD_DATE
string(TIMESTAMP BUILD_DATE %Y%m)
# cmake modules setup
find_package(ECM 1.4.0 QUIET NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake/)
set(CMAKE_PREFIX_PATH "${Qt5_DIR}/lib/cmake/Qt5")
# KDE po to qm tools
if(ECM_FOUND)
include(kdeFetchTranslation)
include(ECMAddTests)
include(ECMPoQmTools)
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
ecm_install_po_files_as_qm(po)
endif()
option(BUILD_TESTING "Build and enable unit tests" OFF)
include(ECMCoverageOption)
-endif(ECM_FOUND)
+endif()
# add tools (cppcheck, clang-tidy...) if build on testing mode only
# (slower compilation)
if(BUILD_TESTING)
include(CodeQualityUtils)
endif()
set(QT_REQUIRED_VERSION 5.6.0)
if(CMAKE_SYSTEM_NAME STREQUAL Android)
find_package(ECM)
set(ANDROID 1)
# TODO: possibly should be setup by toolchain one day
set(QT_QMAKE_EXECUTABLE "${_qt5Core_install_prefix}/bin/qmake")
if(ECM_VERSION VERSION_GREATER "5.55.0")
set(QT_REQUIRED_VERSION 5.12.0)
endif()
# workaround until this fix is in released ECM
if(ECM_VERSION VERSION_LESS "5.15.0")
add_definitions(-DANDROID)
endif()
endif()
# Set executable filename
if(ANDROID)
set(GCOMPRIS_EXECUTABLE_NAME GCompris)
elseif(SAILFISHOS)
set(GCOMPRIS_EXECUTABLE_NAME harbour-gcompris-qt)
elseif(WIN32)
set(GCOMPRIS_EXECUTABLE_NAME GCompris)
else()
set(GCOMPRIS_EXECUTABLE_NAME gcompris-qt)
endif()
set(GCOMPRIS_VERSION ${GCOMPRIS_MAJOR_VERSION}.${GCOMPRIS_MINOR_VERSION})
# An integer value that represents the version of the application
# Increase it at each release
math(EXPR GCOMPRIS_VERSION_CODE "${GCOMPRIS_MAJOR_VERSION}*10000 + ${GCOMPRIS_MINOR_VERSION}*100 + ${GCOMPRIS_PATCH_VERSION}")
# prevent build in source directory
if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
message(SEND_ERROR "Building in the source directory is not supported.")
message(FATAL_ERROR "Please remove the created \"CMakeCache.txt\" file, the \"CMakeFiles\"
directory and create a build directory and call \"${CMAKE_COMMAND} <path to the sources>\".")
-endif("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+endif()
find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED
Qml Quick Gui Multimedia Core Svg Xml XmlPatterns LinguistTools Sensors)
if(ANDROID)
find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED AndroidExtras)
-endif(ANDROID)
+endif()
if(SAILFISHOS)
find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED Widgets)
-endif(SAILFISHOS)
+endif()
## For now we workaround CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION to clang with a command variable, so not needed
# if(ANDROID AND ECM_VERSION VERSION_LESS "5.56.0" AND Qt5Core_VERSION VERSION_GREATER "5.11.99")
# message(FATAL_ERROR "ECM ${ECM_VERSION} not compatible with Qt ${Qt5Core_VERSION} version for android.")
# endif()
if((UNIX AND NOT APPLE AND NOT SAILFISHOS AND NOT ANDROID) OR WIN32)
find_package(OpenSSL REQUIRED)
endif()
-find_package (KF5 QUIET COMPONENTS
+find_package(KF5 QUIET COMPONENTS
DocTools
)
if(ECM_FOUND)
include(KDEInstallDirs)
if(ECM_VERSION VERSION_GREATER "1.6.0")
add_subdirectory(images)
install(FILES org.kde.gcompris.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES org.kde.gcompris.desktop DESTINATION ${KDE_INSTALL_APPDIR})
else()
message(STATUS "ECM_VERSION is ${ECM_VERSION}, icons and desktop files won't be installed.")
endif()
endif()
# Tell CMake to run moc when necessary:
set(CMAKE_AUTOMOC ON)
# As moc files are generated in the binary dir, tell CMake
# to always look for includes there:
set(CMAKE_INCLUDE_CURRENT_DIR ON)
#get_cmake_property(_variableNames VARIABLES)
#foreach (_variableName ${_variableNames})
# message("${_variableName}=${${_variableName}}")
#endforeach()
set(ACTIVATION_MODE "no" CACHE STRING "Policy for activation [no|inapp|internal]")
option(WITH_DEMO_ONLY "Include only demo activities" OFF)
option(WITH_DOWNLOAD "Internal download" ON)
# @FIXME These permissions should be removed if download is disable
# but it makes the application crash on exit (tested on Android 6)
set(ANDROID_INTERNET_PERMISSION "<uses-permission android:name=\"android.permission.INTERNET\" />")
set(ANDROID_ACCESS_NETWORK_STATE_PERMISSION "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />")
set(GRAPHICAL_RENDERER "auto" CACHE STRING "Policy for choosing the renderer backend [opengl|software|auto]")
# Set output directory
if(CMAKE_HOST_APPLE)
set(_bundle_bin gcompris-qt.app/Contents/MacOS)
set(_data_dest_dir bin/${_bundle_bin}/../Resources)
else()
set(_data_dest_dir share/${GCOMPRIS_EXECUTABLE_NAME})
endif()
if(ANDROID)
# Android .so output
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/android/libs/${ANDROID_ABI}/)
set(GCOMPRIS_TRANSLATIONS_DIR ${CMAKE_BINARY_DIR}/${_data_dest_dir} CACHE INTERNAL "" FORCE)
set(GCOMPRIS_RCC_DIR ${CMAKE_BINARY_DIR}/android/assets/${_data_dest_dir}/rcc CACHE INTERNAL "" FORCE)
if(ACTIVATION_MODE STREQUAL "inapp")
set(ANDROID_BILLING_PERMISSION "<uses-permission android:name=\"com.android.vending.BILLING\"/>")
set(ANDROID_PACKAGE "net.gcompris")
- else(ACTIVATION_MODE)
+ else()
set(ANDROID_PACKAGE "net.gcompris.full")
endif()
add_subdirectory(android)
elseif(CMAKE_HOST_APPLE)
# MacOSX build
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(GCOMPRIS_TRANSLATIONS_DIR ${CMAKE_BINARY_DIR}/${_data_dest_dir}/translations CACHE INTERNAL "" FORCE)
set(GCOMPRIS_RCC_DIR ${CMAKE_BINARY_DIR}/${_data_dest_dir}/rcc CACHE INTERNAL "" FORCE)
else()
# Desktop build
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(GCOMPRIS_TRANSLATIONS_DIR ${CMAKE_BINARY_DIR}/${_data_dest_dir}/translations CACHE INTERNAL "" FORCE)
set(GCOMPRIS_RCC_DIR ${CMAKE_BINARY_DIR}/${_data_dest_dir}/rcc CACHE INTERNAL "" FORCE)
-endif(ANDROID)
+endif()
# Always create these folders
add_custom_command(
OUTPUT shareFolders
COMMAND cmake -E make_directory ${GCOMPRIS_TRANSLATIONS_DIR}
COMMAND cmake -E make_directory ${GCOMPRIS_RCC_DIR}
)
add_custom_target(
createShareFolders ALL
DEPENDS shareFolders
)
include(cmake/rcc.cmake)
# Translations handling
# Simple command calling the python script
add_custom_command(
OUTPUT retrievePoFilesFromSvn
COMMAND python2 tools/l10n-fetch-po-files.py
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
# Install translations
add_custom_target(getSvnTranslations
DEPENDS retrievePoFilesFromSvn
COMMENT "Re-run cmake after this to be able to run BuildTranslations with the latest files"
)
# Get all po files in po/. You can get them doing: python2 tools/l10n-fetch-po-files.py
file(GLOB TRANSLATIONS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "po/*.po")
# Set the output dir for the translation files to /bin
foreach(PoSource ${TRANSLATIONS_FILES})
# Changes the .po extension to .ts
string(REPLACE ".po" ".ts" TsSource ${PoSource})
# Removes the po/ folder
string(REPLACE "po/" "" TsSource ${TsSource})
# qm filename
string(REPLACE ".ts" ".qm" QmOutput ${TsSource})
set(OutTsFile ${CMAKE_BINARY_DIR}/tmp/${TsSource})
add_custom_command(
OUTPUT ${QmOutput}
COMMAND cmake -E make_directory ${GCOMPRIS_TRANSLATIONS_DIR}
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/tmp
# Remove the obsolete translations and set po in the ts output file
COMMAND msgattrib --no-obsolete ${CMAKE_CURRENT_SOURCE_DIR}/${PoSource} -o ${OutTsFile}
# Convert the po into ts
COMMAND Qt5::lconvert -if po -of ts -i ${OutTsFile} -o ${OutTsFile}
# Convert the ts in qm removing non finished translations
COMMAND Qt5::lrelease -compress -nounfinished ${OutTsFile} -qm ${GCOMPRIS_TRANSLATIONS_DIR}/${QmOutput}
)
list(APPEND QM_FILES ${QmOutput})
endforeach()
# Install translations
-if (WIN32)
+if(WIN32)
add_custom_target(BuildTranslations
DEPENDS ${QM_FILES}
COMMENT "If you don't have the .po, you need to run make getSvnTranslations first then re-run cmake"
)
else()
add_custom_target(BuildTranslations ALL
DEPENDS ${QM_FILES}
COMMENT "If you don't have the .po, you need to run make getSvnTranslations first then re-run cmake"
)
endif()
add_custom_command(
OUTPUT doBundleTranslations
COMMAND 7z a -w${CMAKE_BINARY_DIR}/share/${GCOMPRIS_EXECUTABLE_NAME}
${CMAKE_BINARY_DIR}/translations-${GCOMPRIS_VERSION}.7z
${CMAKE_BINARY_DIR}/share/${GCOMPRIS_EXECUTABLE_NAME}/translations
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
# Bundle translations
add_custom_target(BundleTranslations
DEPENDS doBundleTranslations
COMMENT "If you want to provide a zip of the translations on a server (run make BuildTranslations first)"
)
add_custom_command(
OUTPUT doDlAndInstallBundledTranslations
COMMAND curl -fsS -o translations-${GCOMPRIS_VERSION}.7z
- http://gcompris.net/download/translations-${GCOMPRIS_VERSION}.7z
+ http://gcompris.net/download/translations-${GCOMPRIS_VERSION}.7z
COMMAND 7z x -y -o${CMAKE_BINARY_DIR}/share/${GCOMPRIS_EXECUTABLE_NAME}
translations-${GCOMPRIS_VERSION}.7z
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
# Download and install bundled translations
add_custom_target(DlAndInstallBundledTranslations
DEPENDS doDlAndInstallBundledTranslations
COMMENT "Download the bundled translation and install them in the build dir"
)
if(CMAKE_HOST_APPLE)
install(DIRECTORY ${GCOMPRIS_TRANSLATIONS_DIR} DESTINATION ${_bundle_bin})
elseif(ANDROID)
install(DIRECTORY ${GCOMPRIS_TRANSLATIONS_DIR} DESTINATION "share")
else()
install(DIRECTORY ${GCOMPRIS_TRANSLATIONS_DIR} DESTINATION ${_data_dest_dir})
endif()
# Build standalone package option -> if ON, we will copy the required Qt files in the build package.
# If OFF, "make install" will not copy Qt files so only GCompris files will be packaged.
# By default, it is true on Windows (as we deliver NSIS package), macOS (bundled), android (apk) and false on linux (to do make install)
# If you want to create a STGZ package for linux (auto-extractible), override this variable by typing : cmake -DBUILD_STANDALONE=ON
if(UNIX AND NOT ANDROID AND NOT APPLE)
option(BUILD_STANDALONE "Build a standalone package when typing 'make package'" OFF)
else()
option(BUILD_STANDALONE "Build a standalone package when typing 'make package'" ON)
endif()
option(WITH_KIOSK_MODE "Set the kiosk mode by default" OFF)
if(WIN32)
set(COMPRESSED_AUDIO "mp3" CACHE STRING "Compressed Audio format [ogg|aac|mp3]")
elseif(APPLE)
set(COMPRESSED_AUDIO "aac" CACHE STRING "Compressed Audio format [ogg|aac|mp3]")
else()
set(COMPRESSED_AUDIO "ogg" CACHE STRING "Compressed Audio format [ogg|aac|mp3]")
endif()
file(GLOB_RECURSE OGG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/ "*.ogg")
foreach(OGG_FILE ${OGG_FILES})
# This should only replace the extension
string(REGEX REPLACE "ogg$" "aac" AAC_FILE ${OGG_FILE})
add_custom_command(
OUTPUT ${AAC_FILE}
# Put the good line depending on your installation
COMMAND avconv -v warning -i ${OGG_FILE} -acodec libvo_aacenc ${AAC_FILE}
#COMMAND ffmpeg -v warning -i ${OGG_FILE} -acodec aac -strict -2 ${AAC_FILE}
)
list(APPEND AAC_FILES ${AAC_FILE})
# This should only replace the extension
string(REGEX REPLACE "ogg$" "mp3" MP3_FILE ${OGG_FILE})
add_custom_command(
OUTPUT ${MP3_FILE}
# Put the good line depending on your installation
#COMMAND avconv -v warning -i ${OGG_FILE} -acodec mp3 ${MP3_FILE}
COMMAND ffmpeg -v warning -i ${OGG_FILE} -acodec mp3 -strict -2 ${MP3_FILE}
)
list(APPEND MP3_FILES ${MP3_FILE})
endforeach()
add_custom_target(
createAacFromOgg
DEPENDS ${AAC_FILES}
)
add_custom_target(
createMp3FromOgg
DEPENDS ${MP3_FILES}
)
# predownload assets (voices and images) and install them in the rcc folder
set(DOWNLOAD_ASSETS "" CACHE STRING "Download and packages images and voices. use a list like: words,en,fr,pt_BR to retrieve multiple files")
add_custom_command(
OUTPUT predownloadAssets
COMMAND python tools/download-assets.py ${DOWNLOAD_ASSETS} ${COMPRESSED_AUDIO} ${GCOMPRIS_RCC_DIR}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
add_custom_command(
OUTPUT assetsFolders
COMMAND cmake -E make_directory "${GCOMPRIS_RCC_DIR}/data2"
COMMAND cmake -E make_directory "${GCOMPRIS_RCC_DIR}/data2/voices-${COMPRESSED_AUDIO}"
COMMAND cmake -E make_directory "${GCOMPRIS_RCC_DIR}/data2/words"
)
# Install assets
add_custom_target(getAssets
DEPENDS assetsFolders predownloadAssets
)
add_custom_command(
OUTPUT doBundleConvertedOggs
COMMAND 7z a converted_ogg_to_${COMPRESSED_AUDIO}-${GCOMPRIS_VERSION}.7z '-ir!src/*${COMPRESSED_AUDIO}'
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
# Bundle oggs ready to be uploaded on a server. This ease build on system without the appropriate audio
# convertion tools.
add_custom_target(BundleConvertedOggs
DEPENDS doBundleConvertedOggs
COMMENT "Bundle the converted oggs to upload them on a server. First set COMPRESSED_AUDIO appropriately."
)
add_custom_command(
OUTPUT doDlAndInstallBundledConvertedOggs
COMMAND curl -fsS -o converted_ogg_to_${COMPRESSED_AUDIO}-${GCOMPRIS_VERSION}.7z
http://gcompris.net/download/converted_ogg_to_${COMPRESSED_AUDIO}-${GCOMPRIS_VERSION}.7z
COMMAND 7z x -y converted_ogg_to_${COMPRESSED_AUDIO}-${GCOMPRIS_VERSION}.7z
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
# Download and install bundled converted oggs
add_custom_target(DlAndInstallBundledConvertedOggs
DEPENDS doDlAndInstallBundledConvertedOggs
COMMENT "Download the bundled converted oggs and install them in the source dir"
)
set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${GCOMPRIS_VERSION})
add_custom_target(dist
COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
| xz > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.xz
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
if(KF5_FOUND)
add_subdirectory(docs/docbook)
-endif(KF5_FOUND)
+endif()
# qml-box2d
include(cmake/box2d.cmake)
add_subdirectory(src)
if(SAILFISHOS)
# Need to be done at the end, after src
add_subdirectory(platforms/sailfishOS)
endif()
# only enable unit tests for linux
if(BUILD_TESTING)
enable_testing()
add_subdirectory(tests)
-endif(BUILD_TESTING)
+endif()
add_custom_target(binaries)
add_dependencies(binaries ${GCOMPRIS_EXECUTABLE_NAME} rcc_core rcc_menu rcc_activities all_activities)
diff --git a/android/AndroidManifest.xml.cmake b/android/AndroidManifest.xml.cmake
index f3457d8e1..57a6dcf21 100644
--- a/android/AndroidManifest.xml.cmake
+++ b/android/AndroidManifest.xml.cmake
@@ -1,41 +1,41 @@
<?xml version="1.0"?>
<manifest android:versionName="@GCOMPRIS_VERSION@" package="@ANDROID_PACKAGE@" android:installLocation="auto" xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="@GCOMPRIS_VERSION_CODE@">
<application android:label="GCompris" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:icon="@drawable/icon">
<activity android:label="@string/app_name" android:name="net.gcompris.GComprisActivity" android:screenOrientation="unspecified" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<meta-data android:name="android.app.lib_name" android:value="GCompris"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
<meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
<!-- Deploy Qt libs as part of package -->
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
<!-- Run with local libs -->
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
<!-- Messages maps -->
<meta-data android:name="android.app.ministro_not_found_msg" android:value="@string/ministro_not_found_msg"/>
<meta-data android:name="android.app.ministro_needed_msg" android:value="@string/ministro_needed_msg"/>
<meta-data android:name="android.app.fatal_error_msg" android:value="@string/fatal_error_msg"/>
<!-- Splash screen -->
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash"/>
<!-- Splash screen -->
</activity>
</application>
<supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
- <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="28"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@ANDROID_INTERNET_PERMISSION@
@ANDROID_ACCESS_NETWORK_STATE_PERMISSION@
@ANDROID_BILLING_PERMISSION@
</manifest>
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 373df6e98..df397c598 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -1,183 +1,217 @@
#android build
# copied/inspired from stellarium project (http://www.stellarium.org/wiki/index.php/Building_for_Android)
-LIST(APPEND JAVA_SRCS "src/com/android/vending/billing/IInAppBillingService.aidl" "src/net/gcompris/GComprisActivity.java")
+list(APPEND JAVA_SRCS "src/com/android/vending/billing/IInAppBillingService.aidl" "src/net/gcompris/GComprisActivity.java")
-FOREACH(JavaSource ${JAVA_SRCS})
- ADD_CUSTOM_COMMAND(
+foreach(JavaSource ${JAVA_SRCS})
+ add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${JavaSource}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${JavaSource} ${CMAKE_CURRENT_BINARY_DIR}/${JavaSource}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${JavaSource}
)
- LIST(APPEND TARGET_JAVA_FILES ${CMAKE_CURRENT_BINARY_DIR}/${JavaSource})
-ENDFOREACH()
+ list(APPEND TARGET_JAVA_FILES ${CMAKE_CURRENT_BINARY_DIR}/${JavaSource})
+endforeach()
-ADD_CUSTOM_TARGET (java_src DEPENDS ${TARGET_JAVA_FILES})
+add_custom_target(java_src DEPENDS ${TARGET_JAVA_FILES})
-find_program(ANDROID_DEPLOY_QT NAMES androiddeployqt PATHS ${_qt5Core_install_prefix}/bin/ )
+find_program(ANDROID_DEPLOY_QT NAMES androiddeployqt PATHS ${_qt5Core_install_prefix}/bin/)
# Look for androiddeployqt program
-if (NOT ANDROID_DEPLOY_QT)
+if(NOT ANDROID_DEPLOY_QT)
message(FATAL_ERROR "Could not find androiddeployqt. Make sure you set all the Qt5_* paths to the Qt for android compiled version.")
-endif(NOT ANDROID_DEPLOY_QT)
+endif()
# Set version
set(ANDROID_VERSION_NAME ${GCOMPRIS_VERSION})
# Set a name representing the build type
set(APK_SUFFIX "-")
if(ACTIVATION_MODE STREQUAL "inapp")
set(APK_SUFFIX "-inapp${APK_SUFFIX}")
elseif(ACTIVATION_MODE STREQUAL "internal")
set(APK_SUFFIX "-internal${APK_SUFFIX}")
-endif(ACTIVATION_MODE STREQUAL "inapp")
+endif()
# _HOST have been removed from ECM in https://cgit.kde.org/extra-cmake-modules.git/commit/?id=731ba7036effcc430f98031e7f2a9826f6234cba
set(_HOST "${CMAKE_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
string(TOLOWER "${_HOST}" _HOST)
if(WITH_DEMO_ONLY)
set(APK_SUFFIX "-demo${APK_SUFFIX}")
-endif(WITH_DEMO_ONLY)
+endif()
if(WITH_DOWNLOAD)
set(APK_SUFFIX "-dl${APK_SUFFIX}")
-endif(WITH_DOWNLOAD)
+endif()
if(WITH_KIOSK_MODE)
set(APK_SUFFIX "-kiosk${APK_SUFFIX}")
-endif(WITH_KIOSK_MODE)
+endif()
# specific clang addition
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(STDCPP_PATH ",\"stdcpp-path\": \"${ANDROID_NDK}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libc++_shared.so\"")
set(REMOVE_mandroid_FLAG_FOR_CLANG "sed -i -e 's/-mandroid//' Configure")
endif()
set(ANDROID_TOOLCHAIN arm-linux-androideabi)
+if("${ANDROID_ARCH}" STREQUAL "arm64")
+ set(ANDROID_TOOLCHAIN aarch64-linux-android)
+endif()
+
# set android package source for androiddeployqt json file
set(PACKAGE_SOURCE_ANDROID ${CMAKE_BINARY_DIR}/tmpAndroid)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/AndroidManifest.xml.cmake ${PACKAGE_SOURCE_ANDROID}/AndroidManifest.xml @ONLY)
# create json file parsed by the androiddeployqt
set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK_ROOT})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configAndroid.json.cmake ${PACKAGE_SOURCE_ANDROID}/configAndroid.json @ONLY)
# Get all po files in po/ to create the values-{locale} in order to have the locales available in android
file(GLOB TRANSLATIONS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../po/*.po")
foreach(PoSource ${TRANSLATIONS_FILES})
# Remove suffix ".po"
string(REPLACE ".po" "" PoSource ${PoSource})
# Remove prefix "../po/gcompris_"
string(REPLACE "../po/gcompris_" "" locale ${PoSource})
# replace _ par -r for locales with country
string(REPLACE "_" "-r" locale ${locale})
add_custom_command(
OUTPUT ${locale}
COMMAND cmake -E make_directory ${GCOMPRIS_TRANSLATIONS_DIR}
COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/android/res/values-${locale}
COMMAND cmake -E copy ${CMAKE_SOURCE_DIR}/android/strings.xml ${CMAKE_BINARY_DIR}/android/res/values-${locale}/strings.xml
)
list(APPEND ALL_LOCALES ${locale})
endforeach()
-add_custom_command (
+find_program(ZIP_ALIGN NAMES zipalign PATHS ${ANDROID_SDK_ROOT}/build-tools/${ANDROID_SDK_BUILD_TOOLS_REVISION}/)
+
+add_custom_command(
OUTPUT createApkFromAndroidDeployQtDebug
DEPENDS ${PACKAGE_SOURCE_ANDROID}/AndroidManifest.xml
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${PACKAGE_SOURCE_ANDROID}
- COMMAND ${ANDROID_DEPLOY_QT} --output ${CMAKE_CURRENT_BINARY_DIR}/ --input ${PACKAGE_SOURCE_ANDROID}/configAndroid.json --debug
- COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/bin/QtApp-debug.apk ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-debug-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND ${ANDROID_DEPLOY_QT} --output ${CMAKE_CURRENT_BINARY_DIR}/ --input ${PACKAGE_SOURCE_ANDROID}/configAndroid.json --debug --gradle
+ COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/build/outputs/apk/debug/android-debug.apk ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-debug-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
)
-add_custom_command (
+add_custom_command(
OUTPUT createApkFromAndroidDeployQtRelease
DEPENDS ${PACKAGE_SOURCE_ANDROID}/AndroidManifest.xml
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${PACKAGE_SOURCE_ANDROID}
- COMMAND ${ANDROID_DEPLOY_QT} --output ${CMAKE_CURRENT_BINARY_DIR}/ --input ${PACKAGE_SOURCE_ANDROID}/configAndroid.json --release
- COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/bin/QtApp-release-unsigned.apk ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND ${ANDROID_DEPLOY_QT} --output ${CMAKE_CURRENT_BINARY_DIR}/ --input ${PACKAGE_SOURCE_ANDROID}/configAndroid.json --release --gradle
+ COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_CURRENT_BINARY_DIR}/build/outputs/apk/release/android-release-unsigned.apk ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
)
-add_custom_command (
+add_custom_command(
OUTPUT createApkSignedFromAndroidDeployQtRelease
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
- COMMAND jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $ENV{ANDROID_KEYSTORE} -storepass $ENV{ANDROID_KEYSTORE_PASSWD} ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk gcompris
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $ENV{ANDROID_KEYSTORE} -storepass $ENV{ANDROID_KEYSTORE_PASSWD} ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk gcompris
)
-add_custom_command (
+add_custom_command(
OUTPUT createApkSignedAlignedFromAndroidDeployQtRelease
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
- COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
- COMMAND ${ANDROID_SDK_ROOT}/build-tools/21.1.2/zipalign -v 4 ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND ${ZIP_ALIGN} -v 4 ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
)
-add_custom_command (
+add_custom_command(
OUTPUT apkInstall
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
- COMMAND ${ANDROID_SDK_ROOT}/platform-tools/adb install -r ${CMAKE_CURRENT_BINARY_DIR}/bin/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
+ COMMAND ${ANDROID_SDK_ROOT}/platform-tools/adb install -r ${CMAKE_CURRENT_BINARY_DIR}/GCompris-Android-release-signed-aligned-${ANDROID_ABI}${APK_SUFFIX}${GCOMPRIS_VERSION}.apk
)
# Command to create apk from Makefile
-add_custom_target (apk_debug
- DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkFromAndroidDeployQtDebug java_src
+add_custom_target(apk_debug
+ DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkFromAndroidDeployQtDebug java_src
)
# Command to create apk from Makefile
-add_custom_target (apk_release
- DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkFromAndroidDeployQtRelease java_src
+add_custom_target(apk_release
+ DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkFromAndroidDeployQtRelease java_src
)
# Command to create signed apk from Makefile
-add_custom_target (apk_signed
- DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkSignedFromAndroidDeployQtRelease java_src
+add_custom_target(apk_signed
+ DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkSignedFromAndroidDeployQtRelease java_src
)
# Command to create signed aligned apk from Makefile
-add_custom_target (apk_signed_aligned
- DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkSignedAlignedFromAndroidDeployQtRelease java_src
+add_custom_target(apk_signed_aligned
+ DEPENDS ${ALL_LOCALES} move_translations_to_assets package_openssl createApkSignedAlignedFromAndroidDeployQtRelease java_src
)
# Command to install the signed aligned apk through adb from Makefile
-add_custom_target (apk_install
- DEPENDS apkInstall
+add_custom_target(apk_install
+ DEPENDS apkInstall
)
# compile openssl needed to download from https
include(ExternalProject)
set(OPENSSL_DIR "${CMAKE_BINARY_DIR}/external/openssl/")
-configure_file("build_openssl.sh.in" "build_openssl.sh" @ONLY)
+set(SCRIPT_BUILD "build_openssl.sh.in")
+if("${ANDROID_ARCH}" STREQUAL "arm64")
+ set(SCRIPT_BUILD "build_openssl_64.sh.in")
+endif()
+message(STATUS "Building ${SCRIPT_BUILD}")
+configure_file("${SCRIPT_BUILD}" "build_openssl.sh" @ONLY)
+
+if("${ANDROID_ARCH}" STREQUAL "arm")
ExternalProject_Add(
ext_openssl
DOWNLOAD_DIR ${CMAKE_BINARY_DIR}
SOURCE_DIR ${OPENSSL_DIR}
URL https://www.openssl.org/source/openssl-1.0.2q.tar.gz
URL_HASH SHA256=5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684
CONFIGURE_COMMAND echo "Configuration not needed"
BUILD_COMMAND sh "${CMAKE_CURRENT_BINARY_DIR}/build_openssl.sh" <SOURCE_DIR>
INSTALL_COMMAND ""
)
-
-add_custom_command(
+add_custom_command(
OUTPUT package_openssl
COMMAND ${CMAKE_COMMAND} -E copy "${OPENSSL_DIR}/libcrypto.so.1.0.0" "${CMAKE_BINARY_DIR}/android/libs/${ANDROID_ABI}/libcrypto.so"
COMMAND ${CMAKE_COMMAND} -E copy "${OPENSSL_DIR}/libssl.so.1.0.0" "${CMAKE_BINARY_DIR}/android/libs/${ANDROID_ABI}/libssl.so"
)
+else()
+ # For Qt 5.12.5 and above 5.13.0, it needs libcrypto_1_1.so and libssl_1_1.so
+ set(suffix_libssl "")
+ if(Qt5Core_VERSION VERSION_GREATER_EQUAL "5.12.5" AND NOT Qt5Core_VERSION MATCHES "5.13.0")
+ set(suffix_libssl "_1_1")
+ endif()
+ExternalProject_Add(
+ ext_openssl
+ DOWNLOAD_DIR ${CMAKE_BINARY_DIR}
+ SOURCE_DIR ${OPENSSL_DIR}
+ URL https://www.openssl.org/source/openssl-1.1.1c.tar.gz
+ URL_HASH SHA256=f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90
+ CONFIGURE_COMMAND echo "Configuration not needed"
+ BUILD_COMMAND sh "${CMAKE_CURRENT_BINARY_DIR}/build_openssl.sh" <SOURCE_DIR>
+ INSTALL_COMMAND ""
+ )
+add_custom_command(
+ OUTPUT package_openssl
+ COMMAND ${CMAKE_COMMAND} -E copy "${OPENSSL_DIR}/libcrypto.so.1.1" "${CMAKE_BINARY_DIR}/android/libs/${ANDROID_ABI}/libcrypto${suffix_libssl}.so"
+ COMMAND ${CMAKE_COMMAND} -E copy "${OPENSSL_DIR}/libssl.so.1.1" "${CMAKE_BINARY_DIR}/android/libs/${ANDROID_ABI}/libssl${suffix_libssl}.so"
+ )
+endif()
#
add_custom_command(
OUTPUT move_translations_to_assets
COMMAND ${CMAKE_COMMAND} -E copy_directory ${GCOMPRIS_TRANSLATIONS_DIR} ${CMAKE_BINARY_DIR}/android/assets/share/GCompris
)
-if (TARGET create-apk)
- set(PACKAGE_DIR ${PACKAGE_SOURCE_ANDROID})
- set_target_properties(create-apk-GCompris PROPERTIES ANDROID_APK_DIR "${PACKAGE_DIR}")
- add_custom_target(gcompris-move-metadata ALL
- COMMAND cmake -E echo "Moving GCompris shared Android resources"
- COMMAND cmake -E make_directory ${PACKAGE_SOURCE_ANDROID}
- COMMAND cmake -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}" "${PACKAGE_SOURCE_ANDROID}"
- )
- add_dependencies(create-apk gcompris-move-metadata)
+if(TARGET create-apk)
+ set(PACKAGE_DIR ${PACKAGE_SOURCE_ANDROID})
+ set_target_properties(create-apk-GCompris PROPERTIES ANDROID_APK_DIR "${PACKAGE_DIR}")
+ add_custom_target(gcompris-move-metadata ALL
+ COMMAND cmake -E echo "Moving GCompris shared Android resources"
+ COMMAND cmake -E make_directory ${PACKAGE_SOURCE_ANDROID}
+ COMMAND cmake -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}" "${PACKAGE_SOURCE_ANDROID}"
+ )
+ add_dependencies(create-apk gcompris-move-metadata)
endif()
diff --git a/android/build_openssl.sh.in b/android/build_openssl.sh.in
index 362a637e4..114840f12 100644
--- a/android/build_openssl.sh.in
+++ b/android/build_openssl.sh.in
@@ -1,17 +1,15 @@
#!/usr/bin/sh
# The only argument to the script is source directory.
source_dir=$1
-export PATH=@ANDROID_NDK@/toolchains/@ANDROID_TOOLCHAIN@-4.9/prebuilt/@_HOST@/bin/:$PATH
-echo $PATH
-export CROSS_COMPILE="@ANDROID_TOOLCHAIN_PATH@@ANDROID_TOOLCHAIN@-"
+export PATH=@ANDROID_NDK@/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
export NDK_SYSROOT=@ANDROID_NDK@
export ANDROID_NDK_ROOT=@ANDROID_NDK@
export ANDROID_DEV=@ANDROID_NDK@/platforms/android-@CMAKE_ANDROID_API@/arch-arm/usr
export SYSROOT=@ANDROID_NDK@/platforms/android-@CMAKE_ANDROID_API@/arch-arm/
cd ${source_dir}
@REMOVE_mandroid_FLAG_FOR_CLANG@
-./Configure --prefix=. --openssldir=./ssl android-armv7 no-asm shared
-make && make libssl.so.1.0.0 libcrypto.so.1.0.0
+./Configure --prefix=@CMAKE_CURRENT_BINARY_DIR@ --openssldir=./ssl android-arm no-asm shared -D__ANDROID_API__=@CMAKE_ANDROID_API@
+make
cd -
diff --git a/android/build_openssl.sh.in b/android/build_openssl_64.sh.in
similarity index 51%
copy from android/build_openssl.sh.in
copy to android/build_openssl_64.sh.in
index 362a637e4..c4cddb7a7 100644
--- a/android/build_openssl.sh.in
+++ b/android/build_openssl_64.sh.in
@@ -1,17 +1,15 @@
#!/usr/bin/sh
# The only argument to the script is source directory.
source_dir=$1
-export PATH=@ANDROID_NDK@/toolchains/@ANDROID_TOOLCHAIN@-4.9/prebuilt/@_HOST@/bin/:$PATH
-echo $PATH
-export CROSS_COMPILE="@ANDROID_TOOLCHAIN_PATH@@ANDROID_TOOLCHAIN@-"
+export PATH=@ANDROID_NDK@/toolchains/aarch64-linux-android-4.9/prebuilt/@_HOST@/bin/:$PATH
export NDK_SYSROOT=@ANDROID_NDK@
export ANDROID_NDK_ROOT=@ANDROID_NDK@
-export ANDROID_DEV=@ANDROID_NDK@/platforms/android-@CMAKE_ANDROID_API@/arch-arm/usr
-export SYSROOT=@ANDROID_NDK@/platforms/android-@CMAKE_ANDROID_API@/arch-arm/
+export ANDROID_DEV=@ANDROID_NDK@/platforms/android-@CMAKE_ANDROID_API@/arch-@ANDROID_ARCH@/usr
+export SYSROOT=@ANDROID_NDK@/platforms/android-@CMAKE_ANDROID_API@/arch-@ANDROID_ARCH@/
cd ${source_dir}
@REMOVE_mandroid_FLAG_FOR_CLANG@
-./Configure --prefix=. --openssldir=./ssl android-armv7 no-asm shared
-make && make libssl.so.1.0.0 libcrypto.so.1.0.0
+./Configure --prefix=@CMAKE_CURRENT_BINARY_DIR@ --openssldir=./ssl android-arm64 no-asm shared -D__ANDROID_API__=@CMAKE_ANDROID_API@
+make
cd -
diff --git a/android/configAndroid.json.cmake b/android/configAndroid.json.cmake
index 4c57898c9..8246a7cf4 100644
--- a/android/configAndroid.json.cmake
+++ b/android/configAndroid.json.cmake
@@ -1,16 +1,17 @@
{
"description": "This file is to be read by androiddeployqt",
"qt": "@_qt5Core_install_prefix@",
"sdk": "@ANDROID_SDK_ROOT@",
"ndk": "@ANDROID_NDK@",
+ "sdkBuildToolsRevision": "@ANDROID_SDK_BUILD_TOOLS_REVISION@",
"toolchain-prefix": "@ANDROID_TOOLCHAIN@",
"tool-prefix": "@ANDROID_TOOLCHAIN@",
"toolchain-version": "4.9",
"ndk-host": "@_HOST@",
"target-architecture": "@ANDROID_ABI@",
"application-binary": "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@/libGCompris.so",
"android-package-source-directory": "@PACKAGE_SOURCE_ANDROID@/",
"android-package": "net.gcompris",
"android-extra-plugins": "@CMAKE_BINARY_DIR@/lib/qml"
@STDCPP_PATH@
}
diff --git a/appveyor.yml b/appveyor.yml
index 2cc281da5..6774ade76 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,51 +1,51 @@
version: 1.0.{build}
branches:
only:
- - KDE/0.95
+ - KDE/0.97
skip_tags: true
image: Visual Studio 2017
configuration: Release
platform:
- x64
- x86
init:
- cmd:
environment:
CMAKE_GENERATOR: Visual Studio 15
- QT5: C:\Qt\5.12.1\msvc2017
+ QT5: C:\Qt\5.13.2\msvc2017
install:
- cmd: >-
if "%platform%"=="x86" set CMAKE_GENERATOR=Visual Studio 15
- if "%platform%"=="x86" set QT5=C:\Qt\5.12.1\msvc2017
+ if "%platform%"=="x86" set QT5=C:\Qt\5.13.2\msvc2017
if "%platform%"=="x64" set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
- if "%platform%"=="x64" set QT5=C:\Qt\5.12.1\msvc2017_64
+ if "%platform%"=="x64" set QT5=C:\Qt\5.13.2\msvc2017_64
set Path=%QT5%\bin;%Path%
cmake -H. -Bbuild -G "%CMAKE_GENERATOR%" -DCMAKE_SYSTEM_VERSION=10.0 "-DCMAKE_PREFIX_PATH=%QT5%" -DACTIVATION_MODE=internal -DVCREDIST_DIR="build" -DGRAPHICAL_RENDERER=software
cmake --build build --config RelWithDebInfo --target DlAndInstallBundledConvertedOggs
cmake -H. -Bbuild -G "%CMAKE_GENERATOR%" -DCMAKE_SYSTEM_VERSION=10.0 "-DCMAKE_PREFIX_PATH=%QT5%" -DACTIVATION_MODE=internal -DVCREDIST_DIR="build" -DGRAPHICAL_RENDERER=software
cmake --build build --config RelWithDebInfo
cmake --build build --config RelWithDebInfo --target DlAndInstallBundledTranslations
cmake --build build --config RelWithDebInfo --target package
build: off
artifacts:
- path: build/*.exe
deploy:
- provider: FTP
host: gcompris.net
protocol: sftp
username: releaser
password:
secure: kt7OLxDoaFlmFwDtcGfa/X3uVhQj0y1q2YVdBroxp9U=
folder: www
diff --git a/cmake/CodeQualityUtils.cmake b/cmake/CodeQualityUtils.cmake
index 78f79734d..7054a4421 100644
--- a/cmake/CodeQualityUtils.cmake
+++ b/cmake/CodeQualityUtils.cmake
@@ -1,25 +1,25 @@
# These tools are run (for now) only if BUILD_TESTING is ON
# Another useful tool could be clazy compiler too
# Run cppcheck on the code
find_program(CPPCHECK_EXE NAMES cppcheck)
if(CPPCHECK_EXE)
set(CMAKE_CXX_CPPCHECK ${CPPCHECK_EXE})
list(
- APPEND CMAKE_CXX_CPPCHECK
+ APPEND CMAKE_CXX_CPPCHECK
"--enable=all"
"--inconclusive"
- "--force"
+ "--force"
"--inline-suppr"
)
endif()
# Run clang-tidy
find_program(CLANG_TIDY_EXE NAMES clang-tidy)
if(CLANG_TIDY_EXE)
set(CMAKE_CXX_CLANG_TIDY ${CLANG_TIDY_EXE})
list(
APPEND CMAKE_CXX_CLANG_TIDY
- "-checks=*,-fuchsia*,-google*,-hicpp*,-llvm*,-cppcoreguidelines-*,-modernize-use-auto,-readability-braces-around-statements,-readability-static-accessed-through-instance"
+ "-checks=*,-fuchsia*,-google*,-hicpp*,-llvm*,-cppcoreguidelines-*,-modernize-use-auto,-modernize-use-trailing-return-type,-readability-*"
)
endif()
diff --git a/cmake/box2d.cmake b/cmake/box2d.cmake
index 1179f9044..f2bb742ab 100644
--- a/cmake/box2d.cmake
+++ b/cmake/box2d.cmake
@@ -1,83 +1,101 @@
set(QML_BOX2D_MODULE "auto" CACHE STRING "Policy for qml-box2d module [auto|submodule|system|disabled]")
-if (NOT ${QML_BOX2D_MODULE} STREQUAL "disabled")
+if(NOT ${QML_BOX2D_MODULE} STREQUAL "disabled")
include(qt_helper)
getQtQmlPath(_qt_qml_system_path)
- set (_box2d_system_dir "${_qt_qml_system_path}/Box2D.2.0")
+ set(_box2d_system_dir "${_qt_qml_system_path}/Box2D.2.0")
- if (${QML_BOX2D_MODULE} STREQUAL "submodule")
+ if(${QML_BOX2D_MODULE} STREQUAL "submodule")
message(STATUS "Building qml-box2d module from submodule")
set(_need_box2d_submodule "TRUE")
else()
# try to find module in system scope
find_library(QML_BOX2D_LIBRARY NAMES Box2D libBox2D PATHS ${_box2d_system_dir} NO_DEFAULT_PATH)
- if (QML_BOX2D_LIBRARY)
+ # Look in default path if not found
+ if(NOT QML_BOX2D_LIBRARY AND NOT "${CMAKE_FIND_ROOT_PATH}" STREQUAL "")
+ # Remove the root path to look for the library
+ set(_box2d_without_cmake_find_root_path)
+ string(REPLACE "${CMAKE_FIND_ROOT_PATH}" "" _box2d_without_cmake_find_root_path ${_box2d_system_dir})
+ find_library(QML_BOX2D_LIBRARY NAMES Box2D libBox2D PATHS ${_box2d_without_cmake_find_root_path})
+ endif()
+
+ if(QML_BOX2D_LIBRARY)
message(STATUS "Using system qml-box2d plugin at ${QML_BOX2D_LIBRARY}")
# for packaging builds, copy the module manually to the correct location
if(SAILFISHOS)
file(COPY ${_box2d_system_dir}/qmldir ${QML_BOX2D_LIBRARY} DESTINATION share/harbour-gcompris-qt/lib/qml/Box2D.2.0)
elseif(ANDROID)
file(COPY ${_box2d_system_dir}/qmldir ${QML_BOX2D_LIBRARY} DESTINATION lib/qml/Box2D.2.0)
endif()
# FIXME: add others as needed
else()
- if (${QML_BOX2D_MODULE} STREQUAL "auto")
+ if(${QML_BOX2D_MODULE} STREQUAL "auto")
message(STATUS "Did not find the qml-box2d module in system scope, falling back to submodule build ...")
- set (_need_box2d_submodule "TRUE")
+ set(_need_box2d_submodule "TRUE")
else()
message(FATAL_ERROR "Did not find the qml-box2d module in system scope and submodule build was not requested. Can't continue!")
endif()
endif()
endif()
- if (_need_box2d_submodule)
+ if(_need_box2d_submodule)
# build qml-box2d ourselves from submodule
include(ExternalProject)
get_property(_qmake_program TARGET ${Qt5Core_QMAKE_EXECUTABLE} PROPERTY IMPORT_LOCATION)
- set (_box2d_source_dir ${CMAKE_CURRENT_SOURCE_DIR}/external/qml-box2d)
+ set(_box2d_source_dir ${CMAKE_CURRENT_SOURCE_DIR}/external/qml-box2d)
if(WIN32)
- set (_box2d_library_dir "release/")
- set (_box2d_library_file "Box2D.dll")
+ set(_box2d_library_dir "release/")
+ set(_box2d_library_file "Box2D.dll")
elseif(CMAKE_HOST_APPLE)
- set (_box2d_library_dir "")
- set (_box2d_library_file "libBox2D.dylib")
+ set(_box2d_library_dir "")
+ set(_box2d_library_file "libBox2D.dylib")
else()
- set (_box2d_library_dir "")
- set (_box2d_library_file "libBox2D.so")
+ set(_box2d_library_dir "")
+ set(_box2d_library_file "libBox2D.so")
endif()
- set (_box2d_install_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/qml/Box2D.2.0)
+ set(_box2d_install_dir ${CMAKE_CURRENT_BINARY_DIR}/lib/qml/Box2D.2.0)
# make sure submodule is up2date
find_package(Git)
if(GIT_FOUND)
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif()
# for visual studio, we need to create a vcxproj
if(WIN32 AND NOT MINGW)
set(_qmake_options -spec win32-msvc -tp vc)
else()
set(_qmake_options "")
endif()
+ set(BOX2D_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
+ # Ninja is not supported by qmake.
+ # In case Ninja is set as generator, use make on Linux, nmake on Windows
+ if(${CMAKE_GENERATOR} MATCHES "Ninja")
+ if(WIN32)
+ set(QMAKE_MAKE_PROGRAM "nmake")
+ else()
+ set(QMAKE_MAKE_PROGRAM "make")
+ endif()
+ endif()
ExternalProject_Add(qml_box2d
DOWNLOAD_COMMAND ""
SOURCE_DIR ${_box2d_source_dir}
CONFIGURE_COMMAND ${_qmake_program} ${_qmake_options} ${_box2d_source_dir}/box2d.pro
- BUILD_COMMAND ${CMAKE_MAKE_PROGRAM}
+ BUILD_COMMAND ${QMAKE_MAKE_PROGRAM}
INSTALL_DIR ${_box2d_install_dir}
INSTALL_COMMAND cp ${_box2d_library_dir}${_box2d_library_file} ${_box2d_source_dir}/qmldir ${_box2d_install_dir}
)
add_library(qml-box2d SHARED IMPORTED)
set_target_properties(qml-box2d PROPERTIES IMPORTED_LOCATION ${_box2d_install_dir}/${_box2d_library_file})
if(SAILFISHOS)
install(DIRECTORY ${_box2d_install_dir} DESTINATION share/harbour-gcompris-qt/lib/qml)
elseif(APPLE)
install(DIRECTORY ${_box2d_install_dir} DESTINATION gcompris-qt.app/Contents/lib/qml)
else()
install(DIRECTORY ${_box2d_install_dir} DESTINATION lib/qml)
endif()
endif()
endif()
diff --git a/cmake/kdeFetchTranslation.cmake b/cmake/kdeFetchTranslation.cmake
index 55d89f6b6..0b64f0895 100644
--- a/cmake/kdeFetchTranslation.cmake
+++ b/cmake/kdeFetchTranslation.cmake
@@ -1,90 +1,90 @@
#
# This file is mostly copied from the KDECMakeSettings.cmake:
# https://github.com/KDE/extra-cmake-modules/blob/master/kde-modules/KDECMakeSettings.cmake#L320
# Once the last version of ECM will be available on most distributions, we'll
# need to switch to it (or at least use it if available else switch to existing
# l10n-fetch-po-files.py script to retrieve the po)
#
# License of KDECMakeSettings.cmake
#=============================================================================
# Copyright 2014 Alex Merry <alex.merry@kde.org>
# Copyright 2013 Aleix Pol <aleixpol@kde.org>
# Copyright 2012-2013 Stephen Kelly <steveire@gmail.com>
# Copyright 2007 Matthias Kretz <kretz@kde.org>
# Copyright 2006-2007 Laurent Montel <montel@kde.org>
# Copyright 2006-2013 Alex Neundorf <neundorf@kde.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
if(NOT TARGET fetch-translations AND KDE_L10N_AUTO_TRANSLATIONS)
set(KDE_L10N_BRANCH "trunk" CACHE STRING "Branch from l10n.kde.org to fetch from: trunk | stable | lts | trunk_kde4 | stable_kde4")
set(_reponame "gcompris")
set(releaseme_clone_commands
COMMAND git clone --depth 1 https://anongit.kde.org/releaseme.git
)
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/releaseme"
${releaseme_clone_commands}
COMMENT "Fetching releaseme scripts to download translations..."
)
set(_l10n_po_dir "${CMAKE_BINARY_DIR}/po")
set(_l10n_poqm_dir "${CMAKE_BINARY_DIR}/poqm")
if(CMAKE_VERSION VERSION_GREATER 3.2)
set(extra BYPRODUCTS ${_l10n_po_dir} ${_l10n_poqm_dir})
endif()
set(fetch_commands
COMMAND ruby "${CMAKE_BINARY_DIR}/releaseme/fetchpo.rb"
--origin ${KDE_L10N_BRANCH}
--project "${_reponame}"
--output-dir "${_l10n_po_dir}"
--output-poqm-dir "${_l10n_poqm_dir}"
"${CMAKE_SOURCE_DIR}"
)
add_custom_target(fetch-translations ${_EXTRA_ARGS}
COMMENT "Downloading translations for ${_reponame} branch ${KDE_L10N_BRANCH}..."
COMMAND git -C "${CMAKE_BINARY_DIR}/releaseme" pull
COMMAND cmake -E remove_directory ${_l10n_po_dir}
COMMAND cmake -E remove_directory ${_l10n_poqm_dir}
${fetch_commands}
${extra}
${move_translations}
DEPENDS "${CMAKE_BINARY_DIR}/releaseme"
)
set(move_translations COMMAND
bash ${CMAKE_SOURCE_DIR}/tools/move_translations.sh ${_l10n_poqm_dir} ${CMAKE_SOURCE_DIR}/po
)
- if (NOT EXISTS ${_l10n_po_dir} OR NOT EXISTS ${_l10n_poqm_dir})
+ if(NOT EXISTS ${_l10n_po_dir} OR NOT EXISTS ${_l10n_poqm_dir})
execute_process(${releaseme_clone_commands})
execute_process(${fetch_commands})
execute_process(${move_translations})
endif()
endif()
diff --git a/cmake/qt_helper.cmake b/cmake/qt_helper.cmake
index 81696e56c..0cc987e4f 100644
--- a/cmake/qt_helper.cmake
+++ b/cmake/qt_helper.cmake
@@ -1,106 +1,106 @@
function(getQtPluginPaths _plugin_target _absolute_path _subdir _file)
getQtPluginsPath(_qt_plugins_path)
get_target_property(_plugin_path ${_plugin_target} LOCATION)
if(NOT _plugin_path)
message(FATAL_ERROR "Could not find ${_plugin_target} plugin path")
endif()
get_filename_component(_plugin_file ${_plugin_path} NAME)
get_filename_component(_plugin_dir ${_plugin_path} PATH)
file(RELATIVE_PATH _plugin_subdir ${_qt_plugins_path} ${_plugin_dir})
set(${_absolute_path} ${_plugin_path} PARENT_SCOPE)
set(${_subdir} ${_plugin_subdir} PARENT_SCOPE)
set(${_file} ${_plugin_file} PARENT_SCOPE)
endfunction()
# Determine Qt5's plugin-path deriving from lib-dir and trying different
# locations corresponding to different directory layouts, e.g.:
#
# Debian:
# /usr/lib/i386-linux-gnu/libQt5Qml.so.5.4.1
# /usr/lib/i386-linux-gnu/qt5/plugins/
# Opensuse:
# /usr/lib64/libQt5Multimedia.so.5
# /usr/lib64/qt5/plugins/
# Qt installer:
# /opt/Qt5.5.1/5.5/gcc/lib/libQt5Qml.so.5.5.1
# /opt/Qt5.5.1/5.5/gcc/plugins/
#
# The qml/-dir is always a sibling of the plugins/ dir.
function(getQtPluginsPath _path)
get_target_property(_lib_file Qt5::Qml LOCATION)
get_filename_component(_lib_dir ${_lib_file} PATH)
# try $_lib_dir/qt5/plugins (Debian/Opensuse)
set(_plugin_root ${_lib_dir}/qt5/plugins)
- if (NOT IS_DIRECTORY ${_plugin_root})
+ if(NOT IS_DIRECTORY ${_plugin_root})
# try $_lib_dir/../plugins (Qt installer)
get_filename_component(_lib_dir_base ${_lib_dir} PATH)
if(APPLE)
set(_plugin_root ${_lib_dir_base}/../plugins)
else()
set(_plugin_root ${_lib_dir_base}/plugins)
endif()
endif()
set(${_path} ${_plugin_root} PARENT_SCOPE)
endfunction()
function(getQtQmlPath _path)
getQtPluginsPath(_qt_plugins_path)
get_filename_component(_root ${_qt_plugins_path} PATH)
set(${_path} ${_root}/qml PARENT_SCOPE)
endfunction()
function(installQtPlugin _plugin _dest_dir _lib)
getQtPluginPaths(${_plugin} _absolute_path _plugin_subdir _plugin_file)
#needed to build with msys2
if(MINGW)
string(REGEX REPLACE "share/qt5/" "" _plugin_subdir ${_plugin_subdir})
endif()
install(FILES ${_absolute_path} DESTINATION ${_dest_dir}/${_plugin_subdir})
set(_lib "\${CMAKE_INSTALL_PREFIX}/${_dest_dir}/${_plugin_subdir}/${_plugin_file}" PARENT_SCOPE)
endfunction()
-function(installQtPlugin2 _plugin _dest_dir _lib )
+function(installQtPlugin2 _plugin _dest_dir _lib)
get_filename_component(_plugin_file ${_plugin} NAME)
set(_ext ${CMAKE_SHARED_LIBRARY_SUFFIX})
get_filename_component(_plugin_subdir ${_plugin} PATH)
get_filename_component(_plugin_subdir_root ${_plugin_subdir} PATH)
getQtPluginsPath(_qt_plugin_path)
install(DIRECTORY ${_qt_plugin_path}/${_plugin_subdir} DESTINATION ${_dest_dir}/${_plugin_subdir_root})
if(CMAKE_HOST_WIN32)
set(_dbg_suffix "d")
else()
set(_dbg_suffix "_debug")
endif()
set(_install_path \${CMAKE_INSTALL_PREFIX}/${_dest_dir}/${_plugin_subdir})
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
install(CODE "file(REMOVE \"${_install_path}/${_plugin_file}${_ext}\")")
set(_plugin_file ${_plugin_file}${_dbg_suffix}${_ext})
else()
install(CODE "file(REMOVE \"${_install_path}/${_plugin_file}${_dbg_suffix}${_ext}\")")
set(_plugin_file ${_plugin_file}${_ext})
endif()
set(_lib "${_install_path}/${_plugin_file}" PARENT_SCOPE)
endfunction()
-function(installQmlPlugin _plugin _dest_dir _lib )
+function(installQmlPlugin _plugin _dest_dir _lib)
get_filename_component(_plugin_file ${_plugin} NAME)
set(_ext ${CMAKE_SHARED_LIBRARY_SUFFIX})
get_filename_component(_qml_subdir ${_plugin} PATH)
get_filename_component(_qml_subdir_root ${_qml_subdir} PATH)
getQtQmlPath(_qt_qml_path)
install(DIRECTORY ${_qt_qml_path}/${_qml_subdir} DESTINATION ${_dest_dir}/${_qml_subdir_root})
if(CMAKE_HOST_WIN32)
set(_dbg_suffix "d")
else()
set(_dbg_suffix "_debug")
endif()
set(_install_path \${CMAKE_INSTALL_PREFIX}/${_dest_dir}/${_qml_subdir})
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
install(CODE "file(REMOVE \"${_install_path}/${_plugin_file}${_ext}\")")
set(_plugin_file ${_plugin_file}${_dbg_suffix}${_ext})
else()
install(CODE "file(REMOVE \"${_install_path}/${_plugin_file}${_dbg_suffix}${_ext}\")")
set(_plugin_file ${_plugin_file}${_ext})
endif()
set(_lib "${_install_path}/${_plugin_file}" PARENT_SCOPE)
endfunction()
diff --git a/fastlane/metadata/android/en_US/images/featureGraphic.png b/fastlane/metadata/android/en_US/images/featureGraphic.png
new file mode 100644
index 000000000..00410e7c6
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/00.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/00.png
new file mode 100644
index 000000000..212b79c54
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/00.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/01.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/01.png
new file mode 100644
index 000000000..e9d3b9352
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/01.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/02.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/02.png
new file mode 100644
index 000000000..62485625b
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/02.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/03.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/03.png
new file mode 100644
index 000000000..bcd32838d
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/03.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/04.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/04.png
new file mode 100644
index 000000000..cff56820b
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/04.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/05.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/05.png
new file mode 100644
index 000000000..f60588123
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/05.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/06.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/06.png
new file mode 100644
index 000000000..ef8c69754
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/06.png differ
diff --git a/fastlane/metadata/android/en_US/images/phoneScreenshots/07.png b/fastlane/metadata/android/en_US/images/phoneScreenshots/07.png
new file mode 100644
index 000000000..d7b8681b4
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/phoneScreenshots/07.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/00.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/00.png
new file mode 100644
index 000000000..ee2d0c9b3
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/00.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/01.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/01.png
new file mode 100644
index 000000000..50c42fb27
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/01.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/02.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/02.png
new file mode 100644
index 000000000..40b78f475
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/02.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/03.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/03.png
new file mode 100644
index 000000000..2a259d081
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/03.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/04.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/04.png
new file mode 100644
index 000000000..cad8b24fb
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/04.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/05.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/05.png
new file mode 100644
index 000000000..c8eb76b3b
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/05.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/06.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/06.png
new file mode 100644
index 000000000..76a479af9
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/06.png differ
diff --git a/fastlane/metadata/android/en_US/images/sevenInchScreenshots/07.png b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/07.png
new file mode 100644
index 000000000..c46a7c847
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/sevenInchScreenshots/07.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/00.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/00.png
new file mode 100644
index 000000000..1dba3ecbb
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/00.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/01.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/01.png
new file mode 100644
index 000000000..1c9011064
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/01.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/02.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/02.png
new file mode 100644
index 000000000..4ac6c602e
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/02.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/03.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/03.png
new file mode 100644
index 000000000..e636656c6
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/03.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/04.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/04.png
new file mode 100644
index 000000000..5736482b8
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/04.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/05.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/05.png
new file mode 100644
index 000000000..b36aa14b7
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/05.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/06.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/06.png
new file mode 100644
index 000000000..1716971e6
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/06.png differ
diff --git a/fastlane/metadata/android/en_US/images/tenInchScreenshots/07.png b/fastlane/metadata/android/en_US/images/tenInchScreenshots/07.png
new file mode 100644
index 000000000..d25f96175
Binary files /dev/null and b/fastlane/metadata/android/en_US/images/tenInchScreenshots/07.png differ
diff --git a/installer/gcompris-windows-welcome.svg b/installer/gcompris-windows-welcome.svg
new file mode 100644
index 000000000..564022fbf
--- /dev/null
+++ b/installer/gcompris-windows-welcome.svg
@@ -0,0 +1,623 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="164"
+ height="314"
+ viewBox="0 0 164 314"
+ id="svg4250"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="gcompris-windows-welcome.svg"
+ inkscape:export-filename="welcome-page.png"
+ inkscape:export-xdpi="96"
+ inkscape:export-ydpi="96">
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#b8b8b8"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4142136"
+ inkscape:cx="159.8086"
+ inkscape:cy="145.89434"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ showguides="false">
+ <inkscape:grid
+ empspacing="4"
+ id="grid5573"
+ type="xygrid" />
+ </sodipodi:namedview>
+ <defs
+ id="defs4252">
+ <linearGradient
+ y2="440.09"
+ x2="484.17999"
+ gradientTransform="matrix(1,0,0,1.1495,0,-225.41)"
+ y1="222.09"
+ gradientUnits="userSpaceOnUse"
+ x1="480"
+ id="skyG">
+ <stop
+ offset="0"
+ id="stop4428"
+ style="stop-color:#3cc1f1;stop-opacity:1" />
+ <stop
+ offset="1"
+ id="stop4430"
+ style="stop-color:#85d8f6;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.49326656,0,0,0.69962275,-220.11439,-294.7133)"
+ inkscape:collect="always"
+ xlink:href="#skyG"
+ id="linearGradient5018"
+ x1="389.54791"
+ y1="-65.686371"
+ x2="465.39337"
+ y2="259.20303"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ gradientTransform="matrix(1.1705552,0,0,1.1705552,-54.712956,-54.564651)"
+ gradientUnits="userSpaceOnUse"
+ y2="157.80945"
+ x2="347.70065"
+ y1="137.74921"
+ x1="349.33603"
+ id="linearGradient6198"
+ xlink:href="#linearGradient6192"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient6192"
+ inkscape:collect="always">
+ <stop
+ id="stop6194"
+ offset="0"
+ style="stop-color:#3f3f9b;stop-opacity:1" />
+ <stop
+ id="stop6196"
+ offset="1"
+ style="stop-color:#7180b1;stop-opacity:1" />
+ </linearGradient>
+ </defs>
+ <metadata
+ id="metadata4255">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ id="layer3"
+ inkscape:groupmode="layer"
+ style="display:inline"
+ transform="translate(0,250)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Calque 2"
+ style="display:inline"
+ transform="translate(0,250)">
+ <path
+ style="opacity:1;fill:url(#linearGradient5018);fill-opacity:1;stroke-width:0.16015625"
+ d="M 0,-250 V -11.5 C 0,-0.14302 9.1430202,9 20.5,9 h 123 C 154.85698,9 164,-0.14302 164,-11.5 V -250 Z"
+ id="Sky"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssscc" />
+ <path
+ style="fill:#64b560;fill-opacity:1;stroke-width:0.16015625"
+ d="m 48.722534,-58.590942 c 8.302495,-0.0246 15.629661,0.207408 19.02356,0.700682 4.921512,0.715296 7.612721,1.031542 23.182617,2.732669 3.662504,0.400147 8.210788,1.024737 10.109869,1.386351 1.89907,0.361607 7.78246,1.314178 13.07275,2.117065 19.71444,2.991988 28.88284,5.323589 49.88867,13.603272 V -11.5 C 164,-0.14302 154.85698,9 143.5,9 H 20.5 C 9.1430205,9 0,-0.14302 0,-11.5 v -45.434326 c 8.118984,-0.09443 18.14959,-0.416072 23.843263,-0.825804 7.296834,-0.525108 16.576774,-0.806089 24.879271,-0.830812 z"
+ id="path4570"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssscsssscss" />
+ <path
+ style="display:inline;fill:#4da849;fill-opacity:1;stroke-width:0.16015625"
+ d="m 115.27747,-53.465942 c -8.3025,-0.0246 -15.629665,0.207408 -19.023564,0.700682 -4.921512,0.715296 -7.612721,1.031542 -23.182617,2.732669 -3.662504,0.400147 -8.210788,1.024737 -10.109865,1.386351 -1.899073,0.361607 -7.782468,1.314178 -13.072752,2.117065 C 30.174232,-43.537187 21.005834,-46.330581 0,-38.050903 V 64 H 164 V -51.809326 c -8.11898,-0.09443 -18.14959,-0.416072 -23.84326,-0.825804 -7.29684,-0.525108 -16.57678,-0.806089 -24.87927,-0.830812 z"
+ id="path4570-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssccccss" />
+ <g
+ transform="matrix(0.76875074,0,0,0.76875074,-311.36571,-614.14398)"
+ id="layer1-6"
+ inkscape:label="Calque 1">
+ <g
+ style="display:inline;stroke:#696da3;stroke-width:0.27406436;stroke-opacity:1"
+ id="layer1-2-9-5-8-1-7-1"
+ transform="matrix(0.07502216,8.8852241e-5,-8.8878297e-5,0.07500017,420.43795,581.90681)">
+ <g
+ style="stroke-width:0.27406436"
+ id="g3692-1-0-0-7-4-3-1"
+ transform="translate(0,100)" />
+ <g
+ style="opacity:1;stroke-width:0.23366036"
+ transform="matrix(1.1729176,0,0,1.1729176,-138.55678,82.771892)"
+ id="g4879">
+ <g
+ id="g4893"
+ style="stroke-width:0.23366036">
+ <rect
+ transform="rotate(-0.06787775)"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e77936;fill-opacity:0.97254902;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ id="rect5300-8"
+ width="51.613583"
+ height="64.535896"
+ x="405.30322"
+ y="339.82474"
+ rx="2.195874e-06" />
+ <path
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e77936;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ d="M 129.78091,-310.37718 C 66.184813,-237.542 31.111471,-144.13226 31.048622,-47.427472 31.310417,173.55385 210.61095,352.48249 431.52763,352.22077 528.236,351.99954 621.59265,316.75449 694.31693,252.98794 L 647.31029,206.0788 C 587.11168,257.49667 510.60788,285.84724 431.44927,286.07155 247.05521,286.29 97.396838,136.94244 97.178324,-47.505816 97.097795,-126.73168 125.2021,-203.40146 176.43444,-263.82042 Z"
+ id="path4182-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc" />
+ <rect
+ ry="0"
+ rx="2.6814989e-06"
+ y="-134.73581"
+ x="305.66003"
+ height="809.80682"
+ width="63.027927"
+ id="rect4180-3-9"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e77936;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ transform="matrix(0.7061648,-0.70804751,0.70784046,0.70637234,0,0)" />
+ <ellipse
+ transform="rotate(-0.06787775)"
+ ry="283.15811"
+ rx="283.07507"
+ cy="-47.390144"
+ cx="429.38992"
+ id="path4848-5"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e77935;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:18.94767952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ <path
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e77936;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ d="m 689.70145,441.41311 -258.06765,0.30574 -258.06766,0.30573 c -0.0612,-51.62875 128.94208,-77.59592 257.97591,-77.74878 129.03383,-0.15287 258.09824,25.50857 258.1594,77.13731 z"
+ id="rect5297-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccsc" />
+ <path
+ style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:18.94767952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path8810-6-7-0-4-9-8-3"
+ d="m 539.93817,-169.58781 c 0,0 -43.36025,-41.96147 -117.49221,-41.96138 -74.13184,-0.006 -148.26358,89.51785 -148.2638,165.048476 -0.004,75.5305 43.36039,162.250794 158.0549,162.250654 114.69476,-0.0159 167.8458,-60.144712 148.26383,-200.015996 l -141.27055,44.758994 26.57584,27.973919 16.78486,-4.195875 c 0,0 27.97424,34.967846 -13.98726,40.562745 -41.96137,5.594632 -79.72708,-5.594868 -85.32161,-58.74612 -5.59507,-53.151251 36.36658,-90.916477 85.32165,-69.935987 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssccccsscc" />
+ </g>
+ </g>
+ <path
+ style="display:inline;fill:none;fill-opacity:1;stroke:none;stroke-width:7.90594482;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path8808-4-5-4-8-5-7"
+ d="m 363.28038,-311.65418 c -187.09259,0 -338.935762,151.84301 -338.935892,338.935725 0,187.092555 151.843302,338.935875 338.935942,338.935745 187.09251,0 338.93571,-151.84331 338.93583,-338.935745 0,-187.092585 -151.84332,-338.935905 -338.93588,-338.935725 z m 0,77.18338 c 144.4874,0 261.75246,117.265 261.75246,261.752345 1.4e-4,144.487365 -117.26506,261.752465 -261.75246,261.752465 -144.48725,0 -261.75249,-117.2651 -261.75249,-261.752465 C 101.52803,-117.2058 218.79312,-234.4708 363.28038,-234.4708 Z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssssssss" />
+ <g
+ style="fill:#ffffff;fill-opacity:1;stroke-width:0.2363115"
+ transform="matrix(1.1597589,0,0,1.1597589,-82.000066,-96.337087)"
+ id="g4913">
+ <path
+ inkscape:connector-curvature="0"
+ id="path8816-2-7-3-0-1-9"
+ d="m 835.58203,69.257812 c -54.77117,0.06267 -111.97691,6.985245 -159.62109,36.021488 -55.98434,36.86836 -90.64205,106.51401 -80.44922,173.53125 12.26264,60.4881 54.86054,116.49809 114.2764,136.73912 56.74462,18.27255 118.37398,10.92868 174.37399,-6.40905 29.81716,-9.96264 58.06335,-24.36113 84.1543,-41.85156 -23.58793,-52.92463 -46.67265,-106.23757 -70.57032,-158.92187 -2.66253,-0.87217 -1.91177,-2.21534 -0.69827,-4.63383 14.43014,-42.03189 30.13693,-83.60751 44.77054,-125.573204 -35.23341,-4.641306 -70.6298,-9.154474 -106.23633,-8.902344 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path8818-2-9-3-3-6-3"
+ d="m 1032.3438,109.24023 c -81.91939,0.0627 -156.39894,72.78872 -157.84575,154.80274 -4.61321,80.49713 61.05894,158.61863 141.59965,166.40039 77.2477,10.54932 158.3228,-43.7585 175.6961,-120.21403 19.1223,-71.57263 -18.5333,-154.70345 -86.7758,-184.90135 -22.5427,-10.88503 -47.6284,-16.55191 -72.6742,-16.08775 z"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5.97244024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path8820-6-1-2-3-3-9"
+ d="m 1384.6426,81.462891 c -25.8745,28.458209 -51.7487,56.916689 -77.6231,85.374999 -28.511,-26.7396 -57.0222,-53.47909 -85.5332,-80.218749 -40.31,101.012199 -80.6235,202.022999 -120.9336,303.035159 54.7976,18.27066 109.5954,36.54082 164.3926,54.8125 8.6133,-19.1087 17.2266,-38.21746 25.8399,-57.32618 11.4895,10.76368 22.9791,21.52736 34.4687,32.29102 8.0756,-10.48448 16.1496,-20.97014 24.2246,-31.45508 9.2136,14.26237 18.4271,28.52476 27.6406,42.78711 52.8476,-18.56658 105.6963,-37.12991 158.545,-55.69336 -49.689,-98.58615 -99.3772,-197.17275 -149.0645,-295.759763 -0.6523,0.717448 -1.3047,1.434896 -1.957,2.152344 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path8822-4-7-7-8-0-5"
+ d="m 1582.1211,115.42773 c -51.2692,0.3315 -101.6084,11.77308 -150.9941,24.5625 16.6752,95.54414 33.3482,191.08868 50.0234,286.63282 50.6094,-1.27038 101.2188,-2.54052 151.8281,-3.8125 1.9804,-27.00449 -2.8669,-53.82355 -6.041,-80.53516 39.2746,-24.5301 70.9212,-65.52716 75.0684,-112.69531 2.7942,-52.48168 -37.6592,-104.80515 -90.342,-111.96832 -9.742,-1.73002 -19.6618,-2.23798 -29.5428,-2.18403 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ inkscape:connector-curvature="0"
+ id="path8824-1-3-9-3-5-4"
+ d="m 1718.252,117.77539 c -25.1146,1.22305 -45.262,24.79065 -46.2247,49.26563 -18.1944,72.76846 -36.2227,145.58296 -54.3007,218.38281 49.1879,13.51226 97.3819,30.90118 147.123,42.20703 3.3621,0.051 4.4772,-15.4076 8.0386,-13.25973 18.6733,3.02035 37.462,-2.03086 56.2122,-0.5367 30.1967,-0.65264 60.3982,-1.16115 90.5849,-2.18735 -8.3947,-35.22753 -20.4686,-59.32761 -29.6853,-94.33263 34.21,-29.27952 40.6413,-84.21954 16.1196,-121.55542 -19.3086,-33.11441 -55.3293,-53.14779 -92.1047,-60.56083 -31.2359,-9.01252 -63.4977,-13.9408 -95.7629,-17.42281 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ id="path8826-2-9-7-3-5-9"
+ d="m 1880.6887,122.10673 c -11.4319,103.70975 -22.867,207.41915 -34.2989,311.1289 l 167.3556,0.0199 c 12.3694,-98.64539 24.7413,-197.29047 37.1133,-295.93554 -62.2617,-5.71647 -107.6935,-11.45069 -169.9552,-17.16643 l -0.1093,0.99401 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path8828-8-6-1-7-9-7"
+ d="m 2169.6113,114.01758 c -49.6973,-0.14727 -95.9259,39.34126 -103.8846,88.33886 -5.753,21.55258 -4.1897,44.76108 -11.7912,65.54395 -18.713,-1.56887 -35.7708,-10.47892 -54.2265,-13.47851 -5.8864,-1.40059 -11.7956,-2.69871 -17.7031,-4.00586 0,55.32487 0,110.64974 0,165.9746 55.533,14.13056 116.8495,16.32037 169.8632,-8.22656 35.926,-15.44797 57.1223,-54.27344 59.3379,-92.21679 0.6328,-2.46568 -1.1473,-8.58161 2.6778,-5.57813 13.5395,6.50131 28.1693,10.37315 42.875,13.17969 -14.876,-36.25639 -5.5511,-75.25627 -1.7333,-112.71846 1.8601,-20.5625 4.638,-44.28644 -8.9894,-61.71318 -17.0532,-24.23662 -47.5492,-35.61842 -76.4258,-35.09961 z"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ <g
+ style="stroke-width:0.2363115"
+ transform="matrix(1.1597589,0,0,1.1597589,-81.633678,212.9308)"
+ id="g4992">
+ <path
+ sodipodi:nodetypes="ccscccssc"
+ inkscape:connector-curvature="0"
+ d="m 844.48084,-65.346588 28.79835,-80.635232 c 0,0 -128.87376,-13.04839 -181.42931,34.55794 -97.79125,88.582124 -35.44585,201.459155 53.9968,218.14711 87.83482,12.95925 158.39066,-26.638438 158.39066,-26.638438 l -35.99787,-81.35518 c 0,0 -75.59556,28.79831 -98.6342,15.11911 -23.03861,-13.67917996 -32.39806,-41.03756 -17.99894,-58.31656 14.39917,-17.27894 48.95711,-32.39806 92.87451,-20.87875 z"
+ id="path8816-2-7-3-0-1-9-7"
+ style="display:inline;fill:#e77936;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ssssssssss"
+ inkscape:connector-curvature="0"
+ d="m 1035.2696,-107.10412 c -61.20219,0 -110.87348,49.671302 -110.87348,110.873442 0,61.20215 49.67129,110.873448 110.87348,110.873448 61.2023,0 110.8736,-49.671288 110.8736,-110.873438 0,-61.20214 -49.6713,-110.873452 -110.8736,-110.873452 z m 0,73.435642 c 20.6658,5e-5 37.4379,16.77216 37.4379,37.4378 5e-4,20.66567 -16.7721,37.43779 -37.4379,37.43779 -20.6657,-1e-5 -37.43779,-16.77212 -37.43779,-37.43778 0,-20.66564 16.77209,-37.43781 37.43779,-37.43781 z"
+ id="path8818-2-9-3-3-6-3-5"
+ style="display:inline;fill:#e7bb36;fill-opacity:1;stroke:none;stroke-width:5.97244024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccccccc"
+ inkscape:connector-curvature="0"
+ d="m 1166.302,92.324082 74.1556,-185.74902 69.116,64.79618 64.7961,-71.27578 90.7146,179.98935 -67.6759,23.758568 -44.6374,-69.115878 -33.838,43.91742 -45.3573,-42.47752 -35.9979,79.915278 z"
+ id="path8820-6-1-2-3-3-9-3"
+ style="display:inline;fill:#75d21b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="sccccssscsccc"
+ inkscape:connector-curvature="0"
+ d="m 1571.278,-100.98448 c -39.7242,1.300762 -83.155,11.879292 -83.155,11.879292 l 34.5579,197.988268 57.5967,-1.43988 -7.9196,-62.636318 c 0,0 21.5987,0.72001 55.4367,-35.27791 33.8381,-35.99786 29.5183,-71.99574 0.72,-98.63416 -10.7993,-9.98945 -33.4022,-12.659742 -57.2367,-11.879292 z m -12.5992,45.717292 c 10.1418,-0.30309 30.6961,1.79492 33.1181,16.919 3.2292,20.16535 -29.1582,23.39871 -29.1584,23.39861 l -9.7193,-39.59766 c 0,-0.20157 2.3791,-0.61861 5.7596,-0.71995 z"
+ id="path8822-4-7-7-8-0-5-5"
+ style="display:inline;fill:#1bd0d2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccccsccscc"
+ inkscape:connector-curvature="0"
+ d="m 1722.829,-98.464648 -45.3572,182.86921 60.4764,17.998938 17.279,-66.236108 c 36.7178,5.75966 34.558,71.995748 34.558,71.995748 l 64.0761,-1.43994 -23.7585,-79.915268 c 37.4378,-13.67919 38.8777,-32.39806 38.8777,-32.39806 0,0 9.3595,-40.31764 -28.0783,-61.91634 -37.4379,-21.59872 -118.0732,-30.95818 -118.0732,-30.95818 z m 47.5173,50.39701 c 17.279,1.43994 40.3176,17.99895 33.118,31.67815 -7.1996,13.67919 -41.7574,4.31972 -41.7574,4.31972 z"
+ id="path8824-1-3-9-3-5-4-6"
+ style="display:inline;fill:#1b8bd2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ d="m 1924.9226,-92.217012 69.565,7.939471 -25.1986,200.868141 -67.4049,-0.0202 z"
+ id="path8826-2-9-7-3-5-9-2"
+ style="display:inline;fill:#cc77d6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cssccsscc"
+ inkscape:connector-curvature="0"
+ d="m 2031.6909,48.406692 c 0,0 61.9163,17.27895 71.2757,-30.95819 9.3595,-48.23716 5.7597,-107.99362 52.557,-117.35308 46.7972,-9.359422 51.8369,17.279 51.8369,17.279 l -6.4796,55.4367 c 0,0 -20.8788,-17.99894 -34.5581,9.35946 -13.6791,27.35839 10.0795,92.15457 -34.5578,113.75327 -44.6374,21.598728 -100.0741,12.239288 -100.0741,12.239288 z"
+ id="path8828-8-6-1-7-9-7-9"
+ style="display:inline;fill:#e16f6f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.97265291px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ </g>
+ </g>
+ <g
+ style="display:inline;stroke:#696da3;stroke-width:0.32059503;stroke-opacity:1"
+ id="g5453-2"
+ transform="matrix(0.21292484,0,0,0.21292484,50.594894,-100.01016)">
+ <g
+ inkscape:label="body"
+ id="layer2-2"
+ style="stroke-width:0.32059503">
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-5-3-2-1"
+ d="m 438.3354,321.46989 0.18677,-22.74171 27.04473,-5.34993 z"
+ style="fill:#9e670d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-56-9-2"
+ d="m 442.31909,317.24679 0.12985,-15.8533 18.80054,-3.72945 z"
+ style="fill:#f7ae37;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-5-3-2"
+ d="m 384.46746,347.45448 15.11911,-28.40475 31.62604,8.01394 z"
+ style="fill:#9e670d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-56-9"
+ d="m 390.9614,343.63121 10.88961,-19.7466 22.77877,5.57119 z"
+ style="fill:#f7ae37;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-5-3"
+ d="m 328.00468,298.93991 34.41689,5.41767 4.50247,36.53387 z"
+ style="fill:#9e670d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-56"
+ d="m 332.11105,304.31958 26.38809,4.30314 3.45213,29.01803 z"
+ style="fill:#f7ae37;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240-5"
+ d="m 317.45907,235.61604 29.93363,23.8614 -16.86545,41.04158 z"
+ style="fill:#9e670d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path4240"
+ d="m 320.65651,243.5461 22.18025,17.7112 -12.49699,30.46326 z"
+ style="fill:#f7ae37;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cssscc"
+ inkscape:connector-curvature="0"
+ id="path4223"
+ d="m 335.57336,293.34005 c 11.54515,28.42479 27.99102,47.8135 43.86439,47.70322 53.31862,-0.37041 83.79663,-52.59958 88.50088,-56.65563 4.70424,-4.05607 2.31622,60.69553 -41.38659,95.29329 -43.70281,34.59775 -83.06047,37.82968 -112.79418,34.84014 -37.14218,-4.20829 -21.17151,-95.91139 21.8155,-121.18102 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cssscc"
+ inkscape:connector-curvature="0"
+ id="path4223-7"
+ d="m 342.29401,303.93295 c 10.42466,24.9264 19.21833,43.89421 33.55116,43.7975 48.1439,-0.32483 83.71334,-46.13729 87.96104,-49.69415 4.24768,-3.55686 -3.8377,47.50071 -43.29905,77.84034 -39.46133,30.33962 -71.71093,31.96256 -98.5589,29.34095 -33.53743,-3.69035 -18.46926,-79.12507 20.34575,-101.28464 z"
+ style="fill:#86d23a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cssssssscscssssssc"
+ inkscape:connector-curvature="0"
+ id="path4162-6"
+ d="m 300.82479,201.96248 c 11.70674,0.72718 18.78106,18.01798 19.55314,23.46377 0.77207,5.44579 12.42891,45.20481 15.56711,53.95698 6.72419,18.75324 31.7965,69.26075 33.7377,84.90266 3.73326,30.08201 -13.80715,54.40005 -13.83444,60.12189 -0.0249,5.22027 14.37309,29.85489 7.46036,32.29499 -6.91272,2.44011 -32.10379,-10.90775 -34.43796,-15.65867 -2.33416,-4.75093 0.0673,-8.45493 -1.27481,-12.95193 -1.58822,-5.3215 -3.26408,-8.17953 -5.23982,-11.10191 0,0 -29.49229,3.99266 -42.06088,1.48792 -12.5686,-2.50475 -25.52532,-8.71103 -25.52532,-8.71103 0,0 -12.43575,6.35435 -17.04842,11.25518 -4.95787,5.2676 -4.35412,11.81268 -6.29327,13.67104 -1.93916,1.85835 -30.35316,12.249 -35.25492,9.95434 -4.90174,-2.29468 8.58256,-22.05789 9.39054,-26.40483 0.80799,-4.34694 -5.18069,-29.1299 -2.08278,-50.74121 4.26907,-29.78144 29.67084,-59.37047 34.26737,-70.82764 4.59652,-11.45717 35.42548,-92.64311 63.0764,-94.71155 z"
+ style="display:inline;fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cssssssscscssssssc"
+ inkscape:connector-curvature="0"
+ id="path4162-3"
+ d="m 306.61174,196.57833 c 20.7431,-1.4435 11.75869,29.59351 12.49083,34.7576 0.73214,5.16409 10.04527,42.53242 13.02114,50.83185 6.37637,17.78319 29.59081,65.6867 31.43159,80.51951 3.54014,28.52593 -12.60475,53.93141 -12.63062,59.35728 -0.0237,4.95024 14.63168,27.12645 8.07654,29.44034 -6.55515,2.31388 -24.09445,-9.69156 -26.30788,-14.19672 -2.21343,-4.50517 1.01733,-7.40464 -0.2554,-11.66902 -1.50608,-5.04623 -7.05434,-11.48929 -8.92788,-14.26051 0,0 -31.73452,3.20997 -43.65297,0.83479 -11.91847,-2.37517 -28.78909,-10.62669 -28.78909,-10.62669 0,0 -11.33925,9.43503 -15.71333,14.08236 -4.7014,4.99512 -7.30849,13.66431 -9.14732,15.42655 -1.83885,1.76222 -18.26014,9.2792 -22.90834,7.10323 -4.64819,-2.17597 6.21432,-14.86818 6.9805,-18.99027 0.7662,-4.12207 -3.46392,-30.23646 -0.52626,-50.72987 4.04825,-28.24092 28.50413,-58.93812 32.86288,-69.80264 4.35876,-10.86452 36.15906,-97.91863 63.99561,-102.07779 z"
+ style="display:inline;fill:#86d23a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccsc"
+ inkscape:connector-curvature="0"
+ id="path4187"
+ d="m 299.97311,210.38732 c -14.31023,33.20804 -22.64336,131.83894 19.39155,198.76338 -15.71814,9.34976 -63.53461,2.43707 -77.47642,-13.07313 -19.7112,-50.93361 19.94405,-160.60517 41.45841,-181.86041 14.56244,-14.38704 16.62646,-3.82984 16.62646,-3.82984 z"
+ style="fill:#a1d668;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cscscscsssscc"
+ inkscape:connector-curvature="0"
+ id="path4329-7"
+ d="m 278.58855,227.51461 c -6.73031,7.9337 -33.62308,32.18215 -39.85723,41.91653 -6.80867,10.63146 -54.49247,33.96334 -58.55262,34.4736 -1.60941,5.8433 -8.9276,14.99574 -13.64613,14.99574 -4.71853,0 -6.7669,-14.9539 -6.7669,-14.9539 0,0 -13.20425,8.8172 -16.4234,6.0902 -2.94,-2.49051 -1.9868,-10.14382 -0.009,-17.66158 -4.10466,1.40425 -10.69441,0.84596 -14.07329,-4.64994 -2.14255,-3.48495 11.95494,-18.65567 23.40597,-24.21833 8.91989,-4.33308 46.20594,-19.44919 70.64416,-12.50118 11.40149,3.24158 38.67228,-26.7173 46.11585,-29.00524 7.44359,-2.28795 9.16274,5.5141 9.16274,5.5141 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cscscscsssscc"
+ inkscape:connector-curvature="0"
+ id="path4329"
+ d="m 271.86358,232.18906 c -6.46556,7.62162 -30.17127,25.81007 -36.1602,35.16152 -6.54084,10.21326 -53.95734,32.39534 -57.85776,32.88552 -1.54611,5.61345 -6.014,13.72035 -10.54692,13.72035 -4.53293,0 -5.65683,-15.11709 -5.65683,-15.11709 0,0 -12.11926,9.43185 -15.21178,6.81213 -2.82435,-2.39254 -1.11861,-9.89024 0.78066,-17.11227 -3.9432,1.34901 -9.89668,3.74565 -13.14265,-1.53406 -2.05827,-3.34787 12.1041,-15.04331 23.10468,-20.38715 8.56901,-4.16263 42.93998,-18.1026 66.41689,-11.42788 10.953,3.11406 37.05594,-25.11765 44.20671,-27.3156 7.15077,-2.19794 4.85379,0.37235 4.85379,0.37235 z"
+ style="fill:#86d23a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="zczcz"
+ inkscape:connector-curvature="0"
+ id="path4346"
+ d="m 152.99617,280.97719 c 3.83058,8.41052 23.69141,6.87688 27.40098,3.90879 -7.63357,-0.89967 -20.67769,0.36688 -23.83043,-5.24114 -3.15272,-5.60803 6.09553,-9.62436 14.84746,-11.91377 -10.32488,-1.75301 -22.2486,4.8356 -18.41801,13.24612 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ <g
+ inkscape:label="ball"
+ id="layer3-2-3"
+ style="stroke-width:0.32059503" />
+ <g
+ style="display:inline;stroke-width:0.32059503"
+ inkscape:label="head"
+ id="layer5-8">
+ <path
+ sodipodi:nodetypes="ccccccccccccscc"
+ inkscape:connector-curvature="0"
+ id="path6276-4"
+ d="m 347.31123,71.028537 c 10.27035,-9.065548 40.022,-43.986493 40.022,-43.986493 l 30.88284,-2.367385 -2.20849,9.623056 -6.75113,7.999014 25.69381,-13.800319 43.33472,-0.282794 -2.97158,13.355929 -70.20459,26.631059 34.64444,32.585876 -4.35412,10.91583 -38.24444,-0.66256 c 0,0 -20.0918,-32.480821 -20.86387,-34.22606 -0.77207,-1.74524 -9.55213,7.433423 -9.55213,7.433423 z"
+ style="fill:#9e670d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6276"
+ d="m 351.87183,71.351727 c 10.27035,-9.065546 37.23896,-40.479853 37.23896,-40.479853 l 24.09579,-2.844094 -19.87634,24.077839 42.85892,-20.18337 35.8205,-0.290874 -76.0041,32.513162 39.44744,37.247933 -37.52623,-0.67871 c 0,0 -20.10976,-31.381978 -20.88183,-33.127218 -0.77208,-1.745239 -16.39304,13.460964 -16.39304,13.460964 z"
+ style="fill:#f7ae37;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csscc"
+ inkscape:connector-curvature="0"
+ id="path6310-9"
+ d="m 314.94267,199.12449 c 3.95232,4.35723 7.63302,11.85181 8.00745,13.11928 0.37443,1.26745 36.45285,2.62897 38.96329,2.37642 0.33248,-0.0334 -21.26411,-13.65109 -22.73104,-14.34924 -9.12385,3.06916 -14.69399,1.21934 -24.2397,-1.14646 z"
+ style="fill:#a3261b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0"
+ id="path6310-6-3"
+ d="m 322.84959,202.73813 c 2.96206,3.01277 7.45055,6.95619 7.45055,6.95619 0,0 16.67142,0.49685 18.9502,0.27352 0.3018,-0.0295 -10.45651,-5.90232 -11.78807,-6.5197 -8.28197,2.71409 -5.94775,1.38208 -14.61268,-0.71001 z"
+ style="fill:#e12d1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csscc"
+ inkscape:connector-curvature="0"
+ id="path6310"
+ d="m 312.984,205.45626 c 8.33119,0.58174 18.54766,4.54085 19.94816,5.44578 1.4005,0.90495 49.97943,-31.98036 53.11129,-34.61391 0.41479,-0.34879 -37.82054,6.6062 -40.25541,7.30416 -9.84392,11.7105 -18.51662,15.15732 -32.80404,21.86397 z"
+ style="fill:#a3261b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccscc"
+ inkscape:connector-curvature="0"
+ id="path6310-6"
+ d="m 326.00147,201.54562 c 6.74217,0.29087 16.45589,0.0323 16.45589,0.0323 0,0 24.63575,-16.87111 27.76762,-19.50466 0.41479,-0.34879 -19.97314,4.29537 -22.40801,4.99333 -9.84391,11.71049 -7.52807,7.77237 -21.8155,14.47902 z"
+ style="fill:#e12d1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ssccccss"
+ id="path6043-6"
+ d="m 265.87189,16.954224 c -64.72497,0.775667 -93.09012,33.344694 -92.56103,71.346426 0.69893,50.19989 47.42133,92.86928 127.28533,88.32523 -2.82977,6.26585 -7.76647,18.7796 -7.76647,18.7796 0,0 17.38415,-2.98333 16.80842,-6.52176 -0.45018,-2.76664 2.01607,-9.10629 6.71342,-15.43826 32.61541,-8.17497 76.47396,-27.47227 77.98649,-43.53198 C 397.19078,99.62392 321.69953,16.285181 265.87189,16.954224 Z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#5ca124;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="scccscss"
+ inkscape:connector-curvature="0"
+ id="path6043"
+ d="m 266.76828,24.339038 c -62.53296,0.749399 -87.11007,30.353838 -87.8642,65.682072 5.35584,53.00045 63.22045,87.03149 128.19953,80.79308 -2.73394,6.05365 -10.3224,21.13313 -10.3224,21.13313 0,0 10.40338,-1.23402 9.84714,-4.6526 -0.43493,-2.67295 3.75229,-11.52079 8.29055,-17.63833 31.51083,-7.89811 73.01322,-24.75622 74.47453,-40.27204 C 392.14954,100.1206 320.70522,23.692654 266.76828,24.339038 Z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#86d23a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cssc"
+ inkscape:connector-curvature="0"
+ id="path6064"
+ d="m 270.7996,172.32932 c 28.1225,-4.23567 44.89098,-10.40944 48.89184,-16.90297 5.34217,-8.67052 11.7032,5.07851 -33.66588,19.00373 -12.20136,3.74498 -15.22596,-2.10076 -15.22596,-2.10076 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path6066"
+ d="m 312.44655,153.568 c 2.4831,-1.3379 4.30117,-2.11001 8.31322,-3.40969 6.57014,1.16049 8.29582,3.91413 11.77858,6.38305 -6.27931,-1.62168 -12.05307,-4.00605 -20.0918,-2.97336 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="sssss"
+ inkscape:connector-curvature="0"
+ id="path6068"
+ d="m 243.23933,57.161242 c 0,5.364112 -7.27541,10.123953 -12.83586,10.123953 -5.56045,0 -7.60636,-5.039002 -7.37649,-10.398192 0.19751,-4.604614 5.57412,-9.781151 11.13457,-9.781151 5.56044,0 9.07778,4.691273 9.07778,10.05539 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#5ca124;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="sssss"
+ inkscape:connector-curvature="0"
+ id="path6068-3"
+ d="m 192.87203,58.726429 c 0,5.091335 4.74088,9.609128 8.36424,9.609128 3.62336,0 4.95653,-4.782759 4.80674,-9.869422 -0.12871,-4.370466 -3.63227,-9.283772 -7.25561,-9.283772 -3.62336,0 -5.91537,4.452718 -5.91537,9.544066 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#5ca124;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6086-2"
+ d="m 366.33991,114.14833 a 16.695471,31.248016 12.685912 0 1 -23.08881,27.03881 16.695471,31.248016 12.685912 0 1 -9.57499,-33.97768 16.695471,31.248016 12.685912 0 1 23.08881,-27.038817 16.695471,31.248016 12.685912 0 1 9.57499,33.977687 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#5ca124;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6086"
+ d="m 362.48623,116.65953 a 14.898989,28.417902 12.238336 0 1 -20.58439,24.61381 14.898989,28.417902 12.238336 0 1 -8.5364,-30.93035 14.898989,28.417902 12.238336 0 1 20.58439,-24.613813 14.898989,28.417902 12.238336 0 1 8.5364,30.930353 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f2f2f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6086-1"
+ d="m 360.15513,93.57002 a 14.26162,24.967149 14.53452 0 0 -18.79747,21.65071 14.26162,24.967149 14.53452 0 0 5.12804,25.7042 14.898989,28.417902 12.238336 0 0 16.166,-24.33474 14.898989,28.417902 12.238336 0 0 -0.69272,-22.65437 14.26162,24.967149 14.53452 0 0 -0.7979,-0.2309 14.26162,24.967149 14.53452 0 0 -1.00595,-0.1349 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient6198);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6174"
+ d="m 359.93108,104.17132 a 8.9544104,15.291919 11.181683 0 0 -10.27437,13.20076 8.9544104,15.291919 11.181683 0 0 5.28579,16.73985 14.898989,28.417902 12.238336 0 0 7.54459,-17.45316 14.898989,28.417902 12.238336 0 0 1.17514,-11.33976 8.9544104,15.291919 11.181683 0 0 -2.19709,-1.04481 8.9544104,15.291919 11.181683 0 0 -1.53406,-0.10289 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#171717;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <ellipse
+ ry="4.262114"
+ rx="3.0915246"
+ cy="110.13888"
+ cx="353.71384"
+ id="path6200"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.90196078;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <ellipse
+ ry="2.0567842"
+ rx="1.5997211"
+ cy="121.40549"
+ cx="353.65668"
+ id="path6202"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0.90196078;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccscccscssc"
+ inkscape:connector-curvature="0"
+ id="path6363-7"
+ d="m 320.28259,203.07851 c 9.66288,17.54569 25.78629,24.77626 31.93767,26.99968 0,0 46.46092,-66.88688 56.42862,-67.42556 6.64135,-0.35892 10.12913,9.11079 6.50443,17.03407 7.59335,-4.94218 11.64212,-7.76515 18.21992,-5.24068 6.62029,4.96182 -0.13428,17.99223 -2.65316,20.49143 8.17674,-0.36003 15.88083,-2.32533 16.11668,0.29228 0.87688,9.73163 -14.02524,22.03052 -19.72576,21.90538 -8.04788,13.30265 -42.09826,41.71608 -63.2683,41.02297 -21.69784,-0.7104 -49.94403,-26.25531 -49.74644,-34.50468 0.0926,-3.86405 1.95732,-25.67776 6.18634,-20.57489 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccscccscssc"
+ inkscape:connector-curvature="0"
+ id="path6363"
+ d="m 319.43768,206.33725 c 9.27184,16.83563 27.83525,25.57223 33.73769,27.70567 0,0 45.67467,-67.2889 55.23899,-67.80578 6.37258,-0.3444 6.78175,11.21524 3.30375,18.81788 7.28604,-4.74219 13.37621,-10.20316 19.6878,-7.78085 6.35238,4.76102 -3.22996,18.12466 -5.6469,20.52272 7.84582,-0.34546 17.48644,-3.05303 17.71276,-0.54135 0.84138,9.33779 -12.45838,16.61906 -17.92821,16.49898 -7.72219,12.76431 -40.64438,41.12887 -60.95768,40.46369 -20.8197,-0.68175 -48.84696,-26.47754 -51.12726,-29.40243 -2.2803,-2.92489 1.92119,-23.37489 5.97906,-18.47853 z"
+ style="fill:#86d23a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csssscc"
+ inkscape:connector-curvature="0"
+ id="path6293"
+ d="m 338.49646,183.24455 c -15.61268,-1.29679 -109.21516,7.75248 -115.99019,22.94666 -3.4667,7.77471 13.29463,9.01176 10.27034,14.86686 -2.9822,5.77361 21.95885,44.88837 28.47684,50.66041 6.2942,5.57387 56.83429,-75.66258 64.72828,-68.88846 5.4045,4.6378 5.4045,4.6378 5.4045,4.6378 0,0 13.65811,-12.02147 7.11023,-24.22327 z"
+ style="fill:#a3261b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csssscc"
+ inkscape:connector-curvature="0"
+ id="path6293-7"
+ d="m 331.92938,189.01715 c -14.62642,-1.21487 -94.48758,5.66296 -100.83461,19.89732 -3.24772,7.28358 12.07774,5.84078 9.24449,11.32603 -2.79382,5.40889 17.26797,37.2695 23.37422,42.67693 5.89658,5.22176 52.56258,-67.86523 61.59099,-64.19742 l 4.84763,1.96937 c 0,0 7.91152,-0.24122 1.77728,-11.67223 z"
+ style="fill:#e12d1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csccc"
+ inkscape:connector-curvature="0"
+ id="path6380"
+ d="m 388.34365,193.38322 c 11.30277,-5.54276 21.06138,-5.85786 23.52123,-1.11506 1.94572,3.75152 -2.87281,11.57837 -10.27033,15.86875 6.8409,0.25047 19.14916,-12.1682 13.58306,-18.76132 -9.26616,-6.53026 -19.29171,-2.06389 -26.83396,4.00763 z"
+ style="fill:#5ca124;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ </g>
+ </g>
+ <g
+ style="display:inline;stroke:#696da3;stroke-width:0.11377872;stroke-opacity:1"
+ id="g9169-7"
+ transform="matrix(1.8517275,0,0,1.8517274,-799.39255,-1128.7587)">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#1a5694;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 457.13665,602.06436 c 0.10664,0.89458 6.39338,9.71429 7.31096,10.14147 0.91757,0.42718 13.26601,-1.27392 14.00407,-1.9078 0.73806,-0.63388 5.83702,-10.90789 5.66342,-11.94886 -0.1736,-1.04097 -6.74224,-9.48681 -7.72284,-9.94064 -0.9806,-0.45384 -13.29544,0.34712 -14.21002,0.80328 -1.03499,0.51622 -5.15223,11.95797 -5.04559,12.85255 z"
+ id="path18961-5"
+ sodipodi:nodetypes="zzzzzsz" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#3f8cdf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 458.78419,602.08957 c 0.11275,0.93259 5.74923,8.33886 6.59054,8.76072 0.84132,0.42186 11.29498,-1.11587 11.95085,-1.69851 0.65587,-0.58264 5.54036,-10.26076 5.12719,-11.37332 -0.41317,-1.11257 -5.87168,-7.74904 -6.88467,-8.1148 -1.01298,-0.36576 -11.09095,0.0164 -12.12659,0.71516 -1.03565,0.6987 -4.77007,10.77816 -4.65732,11.71075 z"
+ id="path19848-9"
+ sodipodi:nodetypes="zzzzzzz" />
+ <path
+ sodipodi:nodetypes="zzzzz"
+ inkscape:connector-curvature="0"
+ style="fill:#2e66a4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 465.19679,611.24287 c -0.914,-0.0458 4.94201,-11.9549 5.49852,-12.5058 0.55651,-0.55089 11.7149,-1.26484 12.35138,-0.62854 0.63648,0.6363 -5.00787,11.15616 -5.58679,11.59733 -0.57891,0.44117 -11.34911,1.58278 -12.26311,1.53701 z"
+ id="path22551-2" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#1a5694;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 462.80007,590.81838 c 2.12232,2.99499 6.6667,7.46619 6.89906,8.5349 0.23237,1.06871 -3.43202,7.76541 -5.40954,11.71393 l 1.80555,0.53974 c 1.29568,-4.3166 3.94151,-11.25358 4.83965,-11.95244 0.89814,-0.69886 11.8635,-1.41184 12.64822,-0.86596 0.78472,0.54588 -1.08615,-1.61743 -1.08615,-1.61743 -3.8502,0.79988 -11.17038,1.24255 -12.07693,0.97723 -0.90655,-0.26532 -4.58215,-5.86985 -6.59015,-8.33408 z"
+ id="path19850-2"
+ sodipodi:nodetypes="czcczzczcc" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0d5eb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 473.89203,594.84891 c -1.9332,-0.15828 -3.06051,-2.50922 -1.1271,-2.35363 1.93341,0.15558 3.0603,2.51191 1.1271,2.35363 z"
+ id="path4146-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0d5eb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 464.44137,595.62752 c 0.16007,1.93305 -1.97482,3.42972 -2.13757,1.4969 -0.16276,-1.93281 1.97751,-3.42995 2.13757,-1.4969 z"
+ id="path4146-3-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0d5eb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 462.25786,600.35905 c 0.16006,1.93305 -1.97482,3.42972 -2.13758,1.4969 -0.16276,-1.93282 1.97751,-3.42996 2.13758,-1.4969 z"
+ id="path4146-3-6-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0d5eb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 467.4573,599.73511 c 0.16007,1.93305 -1.97481,3.42972 -2.13757,1.4969 -0.16276,-1.93281 1.97751,-3.42995 2.13757,-1.4969 z"
+ id="path4146-3-7-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#c0d5eb;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 465.22154,604.51861 c 0.16006,1.93305 -1.97482,3.42972 -2.13758,1.4969 -0.16276,-1.93282 1.97752,-3.42996 2.13758,-1.4969 z"
+ id="path4146-3-5-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#97bbdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 477.29179,606.68666 c -0.17034,1.93218 -2.52827,3.04479 -2.36062,1.11239 0.16764,-1.9324 2.53096,-3.04456 2.36062,-1.11239 z"
+ id="path4146-3-56-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#97bbdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 473.86769,602.04836 c -0.28209,1.91904 -2.70057,2.89305 -2.42115,0.97363 0.27942,-1.91943 2.70325,-2.89267 2.42115,-0.97363 z"
+ id="path4146-3-56-9-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ </g>
+ </g>
+</svg>
diff --git a/installer/welcome-page.bmp b/installer/welcome-page.bmp
new file mode 100644
index 000000000..29e719a26
Binary files /dev/null and b/installer/welcome-page.bmp differ
diff --git a/org.kde.gcompris.appdata.xml b/org.kde.gcompris.appdata.xml
index 238b3d393..fb97df6a8 100644
--- a/org.kde.gcompris.appdata.xml
+++ b/org.kde.gcompris.appdata.xml
@@ -1,763 +1,857 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop">
<id>org.kde.gcompris.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
- <name>GCompris Educational Game</name>
- <name xml:lang="ar">لعبة «فهمت» التعليميّة</name>
- <name xml:lang="ca">Joc educatiu GCompris</name>
- <name xml:lang="ca-valencia">Joc educatiu GCompris</name>
- <name xml:lang="de">GCompris-Lernspiel</name>
- <name xml:lang="el">Εκπαιδευτικό παιχνίδι GCompris</name>
- <name xml:lang="en-GB">GCompris Educational Game</name>
- <name xml:lang="es">Juego educativo GCompris</name>
- <name xml:lang="et">Hariv mäng GCompris</name>
- <name xml:lang="eu">GCompris hezkuntza-jokoa</name>
- <name xml:lang="fi">GCompris, opettavainen peli</name>
- <name xml:lang="fr">Jeu éducatif GCompris</name>
- <name xml:lang="gl">Xogo educativo GCompris</name>
- <name xml:lang="hi">जीकोंप्रिस शेक्षणिक अनुप्रयोग</name>
- <name xml:lang="id">Permainan Pendidikan GCompris</name>
- <name xml:lang="it">Gioco didattico GCompris</name>
- <name xml:lang="ko">GCompris 교육용 게임</name>
- <name xml:lang="ml">ജികോംപ്രി വിദ്യാഭ്യാസപരമായ കളി</name>
- <name xml:lang="nl">Educatief spel GCompris</name>
- <name xml:lang="nn">GCompris leik-og-lær-spel</name>
- <name xml:lang="pl">Gra edukacyjna GCompris</name>
- <name xml:lang="pt">Jogo Educativo GCompris</name>
- <name xml:lang="pt-BR">Jogo educacional GCompris</name>
- <name xml:lang="ro">Jocul educațional GCompris</name>
- <name xml:lang="ru">Набор обучающих игр GCompris</name>
- <name xml:lang="sk">Výuková hra GCompris</name>
- <name xml:lang="sl">Izobraževalna igra GCompris</name>
- <name xml:lang="sv">GCompris pedagogiskt spel</name>
- <name xml:lang="tr">GCompris Eğitici Oyun</name>
- <name xml:lang="uk">Освітня гра GCompris</name>
- <name xml:lang="x-test">xxGCompris Educational Gamexx</name>
- <name xml:lang="zh-CN">GCompris 教育游戏</name>
- <name xml:lang="zh-TW">GCompris 教育遊戲</name>
+ <name>GCompris</name>
+ <name xml:lang="ca">GCompris</name>
+ <name xml:lang="ca-valencia">GCompris</name>
+ <name xml:lang="cs">GCompris</name>
+ <name xml:lang="de">GCompris</name>
+ <name xml:lang="el">GCompris</name>
+ <name xml:lang="en-GB">GCompris</name>
+ <name xml:lang="es">GCompris</name>
+ <name xml:lang="et">GCompris</name>
+ <name xml:lang="eu">GCompris</name>
+ <name xml:lang="fr">GCompris</name>
+ <name xml:lang="gl">GCompris</name>
+ <name xml:lang="id">GCompris</name>
+ <name xml:lang="it">GCompris</name>
+ <name xml:lang="ko">GCompris</name>
+ <name xml:lang="mk">Жикомпри</name>
+ <name xml:lang="ml">ജികോംപ്രി</name>
+ <name xml:lang="nl">GCompris</name>
+ <name xml:lang="nn">GCompris</name>
+ <name xml:lang="pl">GCompris</name>
+ <name xml:lang="pt">GCompris</name>
+ <name xml:lang="pt-BR">GCompris</name>
+ <name xml:lang="ro">GCompris</name>
+ <name xml:lang="ru">GCompris</name>
+ <name xml:lang="sk">GCompris</name>
+ <name xml:lang="sv">GCompris</name>
+ <name xml:lang="uk">GCompris</name>
+ <name xml:lang="x-test">xxGComprisxx</name>
+ <name xml:lang="zh-TW">GCompris</name>
<summary>Multi-Activity Educational game for children 2 to 10</summary>
<summary xml:lang="ar">لعبة تعليميّة متعدّدة الأنشطة للأطفال من سنتين إلى ١٠ سنوات</summary>
+ <summary xml:lang="br">C'hoari kelennadel gant oberezioù a bep seur evit ar vugale etre 2 ha 10 vloaz</summary>
<summary xml:lang="ca">Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys</summary>
<summary xml:lang="ca-valencia">Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys</summary>
<summary xml:lang="de">Lernspiel mit vielen Aktivitäten für Kinder von 2 bis 10 Jahren</summary>
<summary xml:lang="el">Εκπαιδευτικό παιχνίδι πολλαπλών δραστηριοτήτων για ηλικίες 2 έως 10 ετών</summary>
<summary xml:lang="en-GB">Multi-Activity Educational game for children 2 to 10</summary>
<summary xml:lang="es">Juego educativo multiactividad para niños de 2 a 10 años</summary>
<summary xml:lang="et">Rohkete tegevustega hariv mäng lastele vanuses 2-10</summary>
<summary xml:lang="eu">Jarduera anitzeko Hezkuntza-jokoa 2 eta 10 urte arteko haurrentzat</summary>
<summary xml:lang="fi">Useampitoimintoinen opettavainen peli 2–10-vuotiaille lapsille</summary>
<summary xml:lang="fr">Jeu éducatif multi-activités pour les enfants de 2 à 10 ans</summary>
<summary xml:lang="gl">Xogo educativo con varias actividades para nenos de entre 2 e 10 anos</summary>
<summary xml:lang="hi">२ से १० वर्ष के बच्चों के लिओ विभिन्न क्रियाओं वाला शेक्षणिक खेल</summary>
<summary xml:lang="id">Permainan Pendidikan berisi berbagai kegiatan untuk anak-anak 2 hingga 10 tahun</summary>
<summary xml:lang="it">Gioco didattico multi-attività per bambini da 2 a 10 anni</summary>
<summary xml:lang="ko">2-10세 어린이를 위한 다양한 활동이 있는 교육용 게임</summary>
- <summary xml:lang="ml">2 തൊട്ട് 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വേണ്ടിയുള്ള വിവിധ-പ്രവർത്തനങ്ങളിലൂടെയുള്ള വിദ്യാഭ്യാസപരമായ കളി</summary>
+ <summary xml:lang="mk">Едукативна игра со повеќе активности за деца од 2 до 10 години</summary>
+ <summary xml:lang="ml">2 മുതൽ 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വിവിധ പ്രവർത്തനങ്ങളിലൂടെ പഠിക്കാനായുള്ള കളി</summary>
<summary xml:lang="nl">Educatief spel met meerdere activiteiten voor kinderen van 2 tot 10</summary>
<summary xml:lang="nn">Leik-og-lærspel med mange aktivitetar – for barn frå 2 til 10 år</summary>
<summary xml:lang="pl">Gra edukacyjna z wieloma aktywnościami dla dzieci w wieku od 2 do 10 lat</summary>
<summary xml:lang="pt">Jogo Educativo Multi-Actividades para crianças dos 2 aos 10 anos</summary>
<summary xml:lang="pt-BR">Jogo educacional com várias atividades para crianças de 2 a 10 anos</summary>
<summary xml:lang="ro">Joc educațional cu activități multiple pentru copii între 2 și 10 ani</summary>
<summary xml:lang="ru">Интерактивные обучающие игры для детей от 2 до 10 лет</summary>
<summary xml:lang="sk">Viac-aktivitová výuková hra pre deti od 2 do 10 rokov</summary>
<summary xml:lang="sl">Izobraževalna igra z več dejavnostmi za otroke med drugim in desetim letom starosti</summary>
<summary xml:lang="sv">Pedagogiskt multiaktivitetsspel för barn från 2 till 10 år</summary>
<summary xml:lang="tr">2 ile 10 yaş arasındaki çocuklar için çok Etkinlikli oyun</summary>
<summary xml:lang="uk">Набір освітніх ігор для дітей від 2 до 10 років</summary>
<summary xml:lang="x-test">xxMulti-Activity Educational game for children 2 to 10xx</summary>
<summary xml:lang="zh-CN">为 2 到 10 岁儿童准备的多功能教育游戏</summary>
<summary xml:lang="zh-TW">為 2-10 歲孩子設計的教育遊戲</summary>
<description>
<p>GCompris is a high quality educational software suite, including a large number of activities for children aged 2 to 10.</p>
<p xml:lang="ar">«فهمت» هو طقم برمجيّات تعليميّة عالية الجودة يضمّ مختلف الأنشطة للأطفال من سنتين إلى ١٠ سنوات.</p>
+ <p xml:lang="br">Un dastumadeg a-feson gant obererezhioù ha c'hoarioù kelennadel evit ar vugale etre 2 ha 10 vloaz eo GCompris.</p>
<p xml:lang="ca">El GCompris és una suite de programari educatiu d'alta qualitat, que inclou una gran quantitat d'activitats per a nens i nenes entre els 2 i els 10 anys.</p>
- <p xml:lang="ca-valencia">El GCompris és una suite de programari educatiu d'alta qualitat, que inclou una gran quantitat d'activitats per a nens i nenes entre els 2 i els 10 anys.</p>
+ <p xml:lang="ca-valencia">El GCompris és una suite de programari educatiu d'alta qualitat, que inclou una gran quantitat d'activitats per a xiquets i xiquetes entre els 2 i els 10 anys.</p>
<p xml:lang="cs">GCompris je vysoce kvalitní vzdělávací softwarový balík, skládající se z mnoha aktivit pro děti ve věku 2-10.</p>
<p xml:lang="de">GCompris ist eine Lernsoftware mit vielen Aktivitäten für Kinder im Alter von 2 bis 10 Jahren.</p>
<p xml:lang="el">Το GCompris είναι μια σουίτα εκπαιδευτικού λογισμικού με πολυάριθμες δραστηριότητες για παιδιά ηλικίας 2 έως 10 ετών.</p>
<p xml:lang="en-GB">GCompris is a high quality educational software suite, including a large number of activities for children aged 2 to 10.</p>
<p xml:lang="es">GCompris es un conjunto de programas educativos de alta calidad que contiene un gran número de actividades para niños entre 2 y 10 años.</p>
- <p xml:lang="eu">GCompris kalitate handiko hezkuntza-softwarea multzo bat da, 2 eta 10 urte bitarteko haurrentzako jarduera ugari dituena.</p>
+ <p xml:lang="et">GCompris on kvaliteetne õpirakenduse komplekt, mis koosneb paljudest tegevustest lastele vanuses 2-10,</p>
+ <p xml:lang="eu">GCompris kalitate handiko hezkuntza-software multzo bat da, 2 eta 10 urte bitarteko haurrentzako jarduera ugari dituena.</p>
<p xml:lang="fi">GCompris on laadukas monitoimintoinen opetusohjelmisto 2–10-vuotiaille lapsille.</p>
<p xml:lang="fr">GCompris est un logiciel éducatif qui propose des activités variées aux enfants de 2 à 10 ans. Il est plébiscité par les écoles maternelles et primaires de part sa qualité et son spectre couvrant les cycles 1, 2 et 3.</p>
<p xml:lang="gl">GCompris é unha colección de programas educativos que inclúe numerosas actividades para nenas e nenos de entre 2 e 10 anos.</p>
<p xml:lang="hi">जीकॉम्परी एक शैक्षिक सॉफ्टवेयर सूट है जिसमें 2 से 10 वर्ष की आयु के बच्चों के लिए कई गतिविधियां शामिल हैं।</p>
<p xml:lang="id">GCompris adalah kumpulan permainan mendidik yang berisi berbagai kegiatan untuk anak umur 2 hingga 10 tahun.</p>
<p xml:lang="it">GCompris è una raccolta di alta qualità di programmi didattici che comprende numerose attività per bambini da 2 a 10 anni.</p>
- <p xml:lang="ml">ജികോംപ്രി, വളരെ ഗുണനിലവാരമുള്ള വിദ്യാഭ്യാസപരമായ ഒരു സോഫ്റ്റുവെയർ ആണ്, ഇതിൽ 2 തൊട്ട് 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വേണ്ടിയുള്ള വിവിധ-പ്രവർത്തനങ്ങൾ അടങ്ങിയിരിക്കുന്നു.</p>
+ <p xml:lang="ko">GCompris는 2세에서 10세 사이의 아동을 위한 많은 활동을 포함하는 고품질의 교육용 소프트웨어 제품군입니다.</p>
+ <p xml:lang="mk">Жикомпри е висококвалитетен образовен софтвер, кој вклучува голем број активности за деца на возраст од 2 до 10 години.</p>
+ <p xml:lang="ml">2 മുതൽ 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വേണ്ടിയുള്ള വിവിധ പ്രവർത്തനങ്ങൾ അടങ്ങിയിട്ടുള്ള വളരെ ഗുണനിലവാരമുള്ള ഒരു വിദ്യാഭ്യാസ സോഫ്റ്റ്‍വെയർ ആണ് ജികോംപ്രി.</p>
<p xml:lang="nl">GCompris is een educatief softwarepakket van hoge kwaliteit, inclusief een groot aantal activiteiten voor kinderen van 2 tot 10 jaar.</p>
<p xml:lang="nn">GCompris er eit leik og lær-spel med mange ulike aktivitetar for ungar frå 2 til 10 år.</p>
<p xml:lang="pl">GCompris to wysokiej jakości pakiet oprogramowania edukacyjnego z licznymi aktywnościami dla dzieci w wieku od 2 do 10 lat.</p>
<p xml:lang="pt">O GCompris é um pacote aplicacional educativo de alta qualidade, composto por uma grande quantidade de actividades para crianças dos 2 aos 10 anos.</p>
<p xml:lang="pt-BR">O GCompris é uma suíte de software educacional de alta qualidade que inclui um grande número de atividades para crianças com idade entre 2 e 10 anos.</p>
<p xml:lang="ro">GCompris este un pachet de software educațional compus din numeroase activități pentru copii între 2 și 10 ani.</p>
<p xml:lang="ru">GCompris — большая коллекция обучающих игр и упражнений для детей от 2 до 10 лет.</p>
+ <p xml:lang="sk">GCompris je balík výukového softvéru zložený z rôznych aktivít pre deti od 2 do 10 rokov.</p>
<p xml:lang="sl">Program GCompris je visokokakovostna izobraževalna zbirka, sestavljena iz velikega števila dejavnosti, ki so namenjena otrokom med drugim in desetim letom starosti.</p>
<p xml:lang="sv">GCompris är en högkvalitativ pedagogisk programvarusvit som innehåller ett stort antal aktiviteter för barn mellan 2 och 10 år.</p>
<p xml:lang="tr">GCompris, 2 ile 10 yaş arasındaki çocuklar için çok sayıda etkinlik içeren bir eğitim yazılımı paketidir.</p>
<p xml:lang="uk">GCompris — високоякісний комплекс навчального програмного забезпечення, що складається з багатьох вправ для дітей від 2 до 10 років.</p>
<p xml:lang="x-test">xxGCompris is a high quality educational software suite, including a large number of activities for children aged 2 to 10.xx</p>
<p xml:lang="zh-TW">GCompris 是一套教育軟體的集合,它提供適合兩歲到十歲兒童各種不同的遊戲。</p>
<p>Some of the activities are game orientated, but nonetheless
still educational.</p>
<p xml:lang="ar">بعض الأنشطة هدفها الترفيه، ولكنّها -مع ذلك- تعليميّة.</p>
+ <p xml:lang="br">Obererezhioù 'zo a zo bet troet da c'hoarioù, chom a reont kelennadel avat.</p>
<p xml:lang="ca">Algunes de les activitats estan orientades a joc, però sempre són educatives.</p>
<p xml:lang="ca-valencia">Algunes de les activitats estan orientades a joc, però sempre són educatives.</p>
<p xml:lang="cs">Některé aktivity jsou v podobě her, ale přesto jsou poučné.</p>
<p xml:lang="de">Einige Aktivitäten sind eher spielerisch, aber immer lehrreich.</p>
<p xml:lang="el">Ορισμένες από τις δραστηριότητες είναι απλώς παιχνίδια, αλλά οπωσδήποτε με εκπαιδευτικό χαρακτήρα.</p>
<p xml:lang="en-GB">Some of the activities are game orientated, but nonetheless still educational.</p>
<p xml:lang="es">Algunas de las actividades son juegos, aunque siguen siendo educativas.</p>
<p xml:lang="et">Mõned tegevused on mängulisemad, aga siiski õppeotstarbega.</p>
<p xml:lang="eu">Jardueretako batzuk jolasera zuzenduak daude, hala eta guztiz ere, heztea dute helburu.</p>
<p xml:lang="fi">Jotkin toiminnoista ovat pelimäisiä mutta silti opettavaisia.</p>
<p xml:lang="fr">Certaines activités sont ludiques mais ont toujours un intérêt pédagogique.</p>
<p xml:lang="gl">Algunhas das actividades están orientadas ao xogo, pero son aínda así educativas.</p>
<p xml:lang="hi">कुछ गतिविधियां खेल केंद्रित हैं, लेकिन फिर भी शैक्षिक हैं।</p>
<p xml:lang="id">Beberapa kegiatan berorientasi pada permainan, tetapi masih memiliki nilai pendidikan.</p>
<p xml:lang="it">Alcune delle attività sono orientate al gioco, ma comunque didattiche.</p>
<p xml:lang="ko">일부 활동은 기능성 게임을 지향합니다.</p>
- <p xml:lang="ml">ചില പ്രവർത്തനങ്ങൾ കളിയെ അടിസ്ഥാനമാക്കിയാണ്, പക്ഷേ അവയും വിദ്യാഭ്യാസപരമാണ്.</p>
+ <p xml:lang="mk">Некои од активностите се ориентирани кон игри, но сепак се едукативни.</p>
+ <p xml:lang="ml">ചില പ്രവർത്തനങ്ങൾ കളിയെ അടിസ്ഥാനമാക്കിയാണ്, എന്നിരുന്നാലും വിദ്യാഭ്യാസപരമാണ്.</p>
<p xml:lang="nl">Sommige activiteiten zijn spelletjes, maar toch leerzaam.</p>
<p xml:lang="nn">Nokre av aktivitetane er mest som spel, men er likevel lærerike.</p>
<p xml:lang="pl">Niektóre z aktywności są bardziej grą, lecz nadal bardzo pouczającą.</p>
<p xml:lang="pt">Algumas das actividades são apresentadas como jogos, mas são educativas à mesma.</p>
<p xml:lang="pt-BR">Algumas das atividades são de orientação lúdica, mas mesmo assim ainda educacionais.</p>
<p xml:lang="ro">Unele activități sunt orientate pe joacă, dar totuși educative.</p>
<p xml:lang="ru">Некоторые из заданий представлены в игровой форме, но и они являются обучающими.</p>
<p xml:lang="sk">Niektoré z aktivít sú herne orientované, ale stále výukové.</p>
<p xml:lang="sl">Nekatere dejavnosti so bolj podobne igram, vendar še vedno poučne.</p>
<p xml:lang="sv">Vissa av aktiviteterna är spelorienterade, men trots det ändå pedagogiska.</p>
<p xml:lang="tr">Bazı etkinlikler oyun odaklıdır, ancak yine de eğiticidir.</p>
<p xml:lang="uk">Деякі із вправ є суто ігровими, але містять і елементи навчання.</p>
<p xml:lang="x-test">xxSome of the activities are game orientated, but nonetheless still educational.xx</p>
<p xml:lang="zh-CN">一些活动是游戏导向的,不过尽管如此仍是教育性的。</p>
<p xml:lang="zh-TW">有些活動是遊戲性質,但還是有很棒的教育意義。</p>
<p>Below you can find a list of categories with some of the
activities available in that category.</p>
<p xml:lang="ar">يمكنك أن تجد أدناه قائمة بالفئات وبعض الأنشطة الموجودة في كل فئة.</p>
+ <p xml:lang="br">Amañ dindan e kaver ur roll eus ar rummadoù gant un toullad eus an oberezhioù kinniget e pep rummad.</p>
<p xml:lang="ca">A continuació trobareu una llista de les categories amb algunes de les activitats disponibles en cadascuna.</p>
<p xml:lang="ca-valencia">A continuació trobareu una llista de les categories amb algunes de les activitats disponibles en cadascuna.</p>
<p xml:lang="de">Sie können Aktivitäten aus folgenden Bereichen in GCompris finden:</p>
<p xml:lang="el">Παρακάτω θα βρείτε μια λίστα με κατηγορίες που περιέχουν ορισμένες από το σύνολο των δραστηριοτήτων σε κάθε κατηγορία.</p>
<p xml:lang="en-GB">Below you can find a list of categories with some of the activities available in that category.</p>
<p xml:lang="es">A continuación puede encontrar una lista de categorías con algunas de las actividades disponibles en cada una de ellas.</p>
<p xml:lang="et">Allpool leiab kategooriate loetelu koos mõningate neile omaste tegevustega.</p>
- <p xml:lang="eu">Behean kategoria zerrenda bat aurki dezakezu, kategoria horretan erabilgarri dauden jardueretako batzuekin.</p>
+ <p xml:lang="eu">Behean kategoria zerrenda bat aurki dezakezu, kategoria horretan erabilgarri dauden jardueretako batzuekin batera.</p>
<p xml:lang="fi">Alta löydät luettelot luokista sekä maininnan joistakin kuhunkin luokkaan kuuluvista toiminnoista.</p>
<p xml:lang="fr">Vous pouvez trouver ci-dessous une liste des catégories avec certaines de leurs activités.</p>
<p xml:lang="gl">A continuación atopará unha lista de categorías e as actividades dispoñíbeis en cada unha desas categorías.</p>
<p xml:lang="hi">नीचे आप उस श्रेणी में उपलब्ध कुछ गतिविधियों के साथ श्रेणियों की एक सूची पा सकते हैं।</p>
<p xml:lang="id">Di bawah ini kamu bisa menemukan daftar kategori dengan beberapa kegiatan yang tersedia di dalam setiap kategori tersebut.</p>
<p xml:lang="it">Di seguito puoi trovare un elenco di categorie con alcune delle attività disponibili per categoria.</p>
<p xml:lang="ko">아래에서 분류 목록과 해당 분류의 활동을 찾을 수 있습니다.</p>
- <p xml:lang="ml">താഴെ, വിഭാഗങ്ങളുടെ ഒരു പട്ടിക നിങ്ങൾക്ക് കാണാം, ആ വിഭാഗങ്ങളിൽ ചില പ്രവർത്തനങ്ങളും ലഭ്യമാണ്.</p>
+ <p xml:lang="mk">Подолу можете да најдете список на категории со некои активности достапни во таа категорија.</p>
+ <p xml:lang="ml">ലഭ്യമായ കുറച്ചു പ്രവർത്തനങ്ങളോടുകൂടിയുള്ള വിഭാഗങ്ങളുടെ ഒരു പട്ടിക താഴെ കൊടുത്തിരിക്കുന്നു.</p>
<p xml:lang="nl">Hieronder vindt u een lijst met categorieën met enige van de activiteiten beschikbaar in die categorie.</p>
<p xml:lang="nn">Nedanfor finn du ei oversikt over kategoriar, saman med nokre av aktivitetane i kvar kategori.</p>
<p xml:lang="pl">Poniżej znajdziesz wykaz kategorii z niektórymi aktywnościami dostępnymi w tej kategorii.</p>
<p xml:lang="pt">Em baixo, poderá encontrar uma lista de categorias, com algumas das actividades disponíveis para essa categoria.</p>
<p xml:lang="pt-BR">Abaixo está relacionada uma lista de categorias com algumas das atividades disponíveis em cada uma delas.</p>
<p xml:lang="ro">Dedesubt puteți găsi o listă de categorii cu unele din activitățile disponibile în acea categorie.</p>
<p xml:lang="ru">Ниже представлен список категорий с доступными в этих категориях заданиями.</p>
<p xml:lang="sk">Tu môžete nájsť zoznam kategórií s niektorými aktivitami dostupnými v kategórii.</p>
<p xml:lang="sl">Spodaj lahko najdete seznam kategorij in nekaj dejavnosti, ki so na voljo v tisti kategoriji.</p>
<p xml:lang="sv">Nedan finns en lista över kategorier med några av aktiviteterna tillgängliga i varje kategori.</p>
<p xml:lang="tr">Aşağıda, bazı etkinliklerin bulunduğu kategorilerin bir listesini bulabilirsiniz.</p>
<p xml:lang="uk">Нижче наведено список категорій із деякими вправами у цих категоріях.</p>
<p xml:lang="x-test">xxBelow you can find a list of categories with some of the activities available in that category.xx</p>
<p xml:lang="zh-CN">下面列出了一些分类和对应分类中的活动。</p>
<p xml:lang="zh-TW">下方您可以看到該類別的遊戲清單。</p>
<ul>
<li>computer discovery: keyboard, mouse, different mouse gestures, ...</li>
<li xml:lang="ar">استكشاف الحاسوب: لوحة المفاتيح والفأرة ومختلف إيماءات الفأرة وغيرها.</li>
+ <li xml:lang="br">Dizoleiñ an urzhiataer: klavier, logodenn, jestroù disheñvel gant al logodenn…</li>
<li xml:lang="ca">descobrir l'ordinador: teclat, ratolí, diferents gestos del ratolí...</li>
<li xml:lang="ca-valencia">descobrir l'ordinador: teclat, ratolí, diferents gestos del ratolí...</li>
<li xml:lang="de">Entdeckung des Computers: Tastatur, Maus, verschiedene Mausgesten ...</li>
<li xml:lang="el">ανακαλύπτω τον υπολογιστή: πληκτρολόγιο, ποντίκι, διάφορες ενδείξεις δείκτη ποντικιού, ...</li>
<li xml:lang="en-GB">computer discovery: keyboard, mouse, different mouse gestures, ...</li>
<li xml:lang="es">descubrimiento del ordenador: teclado, ratón, distintos gestos con el ratón...</li>
<li xml:lang="et">arvuti tundmaõppimine: klaviatuur, hiir, erinevad hiireliigutused ...</li>
<li xml:lang="eu">ordenagailua ezagutzea: teklatua, sagua, saguaren mugimendu ezberdinak, ...</li>
<li xml:lang="fi">tietokoneen oppiminen: näppäimistö, hiiri, eri hiirieleet…</li>
<li xml:lang="fr">découverte de l'ordinateur : clavier, souris, mouvements de la souris…</li>
<li xml:lang="gl">Descubrimento do computador: teclado, rato, xestos do rato, etc.</li>
<li xml:lang="hi">कंप्यूटर की खोज: कीबोर्ड, माउस, अलग माउस इशारों, ...</li>
<li xml:lang="id">Pengenalan komputer: keyboard, mouse, gestur mouse yang berbeda, ...</li>
<li xml:lang="it">scoperta del computer: tastiera, mouse, vari gesti con il mouse, ...</li>
<li xml:lang="ko">컴퓨터와 친해지기: 키보드, 마우스, 마우스 제스처, ...</li>
+ <li xml:lang="mk">откривање на компјутер: тастатура, глувче, различни гестови на глувчето, ...</li>
<li xml:lang="ml">കമ്പ്യൂട്ടർ പഠിക്കാം: കീബോർഡ്, മൗസ്, മൗസ് കൊണ്ടുള്ള വ്യത്യസ്ത ചലനങ്ങൾ, ...</li>
<li xml:lang="nl">ontdekken van de computer: toetsenbord, muis, verschillende muisbewegingen, ...</li>
<li xml:lang="nn">datamaskin: tastatur, mus, ulike muserørsler, …</li>
<li xml:lang="pl">odkrywanie komputera: klawiatura, mysz, różne ruchy myszą, ...</li>
<li xml:lang="pt">descoberta do computador: teclado, rato, os diferentes gestos com o rato, ...</li>
<li xml:lang="pt-BR">conhecendo o computador: teclado, mouse, diferentes movimentações com o mouse, ...</li>
<li xml:lang="ro">descoperirea calculatorului: tastatura, mausul, diferite gesturi cu mausul, ...</li>
<li xml:lang="ru">знакомство с компьютером: клавиатура, мышь, различные жесты мышью, ...</li>
<li xml:lang="sk">objavovanie počítača: klávesnica, myš, rôzne gestá myši...</li>
<li xml:lang="sl">delo z računalnikom: tipkovnica, miška, kretnje miške, ...</li>
<li xml:lang="sv">upptäcka datorn: tangentbord, mus, olika musgester, ...</li>
<li xml:lang="tr">bilgisayarı keşfetme: klavye, fare, farklı fare hareketleri, ...</li>
<li xml:lang="uk">Знайомство з комп’ютером: клавіатура, миша, керування мишею…</li>
<li xml:lang="x-test">xxcomputer discovery: keyboard, mouse, different mouse gestures, ...xx</li>
<li xml:lang="zh-CN">探索电脑:键盘、鼠标、不同的鼠标手势……</li>
<li xml:lang="zh-TW">電腦探索:鍵盤、滑鼠、不同的滑鼠手勢等</li>
<li>arithmetic: table memory, enumeration, mirror image, balance
the scale, change giving, ...</li>
<li xml:lang="ar">الحساب: جدول الضرب والعدّ وصورة المرآة وموازنة كفّتا الميزان وإعطاء الباقي وغيرها.</li>
+ <li xml:lang="br">Jediñ : deskiñ an taolennoù-jediñ, niveriñ eeun, simetriezh ar skeudenn, kempouezañ ar bouezerez, distreiñ ar moneiz, ...</li>
<li xml:lang="ca">aritmètica: memoritzar la taula, enumeració, imatge al mirall, equilibrar la balança, donar el canvi...</li>
<li xml:lang="ca-valencia">aritmètica: memoritzar la taula, enumeració, imatge al mirall, equilibrar la balança, donar el canvi...</li>
<li xml:lang="de">Arithmetik: Kombitabellen, Aufzählungen, Bilder spiegeln, Gewichte ausgleichen, Wechselgeld geben...</li>
- <li xml:lang="el">αριθμητική: μνημονικός πίνακας, απαρίθμηση, κάτοπτρο, ισορροπώ τη ζυγαριά, δίνω ρέστα, ...</li>
+ <li xml:lang="el">αριθμητική: παιχνίδια memory, απαρίθμηση, κάτοπτρο, ισορροπώ τη ζυγαριά, δίνω ρέστα, ...</li>
<li xml:lang="en-GB">arithmetic: table memory, enumeration, mirror image, balance the scale, change giving, ...</li>
<li xml:lang="es">aritmética: memorización de tablas, enumeración, imagen especular, equilibrar la balanza, devolver cambios...</li>
- <li xml:lang="et">aritmeetika: nähtu mäletamine, loendamine, peegelpildid, kaalu tasakaalustamine, raha tagasiandmine...</li>
+ <li xml:lang="et">aritmeetika: nähtu mäletamine, loendamine, peegelpildid, kaalu tasakaalustamine, raha tagasiandmine ...</li>
<li xml:lang="eu">aritmetika: eragiketa matematikoen taulak oroitzea, zenbaketa, irudi ispilatua, balantza orekatu, diru xehea itzultzea, ...</li>
<li xml:lang="fi">aritmetiikka: kertotaulujen opettelu, laskutehtävät, peilikuvan piirtäminen, vaa’an tasapainottaminen, vaihtorahan antaminen, …</li>
<li xml:lang="fr">arithmétique : apprentissage des tables d'opérations mathématiques, l'énumération, de symétrie d'image, équilibrage de la balance, rendre la monnaie…</li>
<li xml:lang="gl">Aritmética: táboas de memoria, enumeración, imaxes espello, equilibrio de balanzas, cálculo do cambio, etc.</li>
<li xml:lang="hi">अंकगणितीय: तालिका मेमोरी, गणण, दर्पण छवि, पैमाने संतुलन, देय परिवर्तन, ...</li>
<li xml:lang="id">aritmatika: tabel ingatan, pencacahan, cerminan gambar, menyeimbangkan skala, ganti memberi, ..</li>
<li xml:lang="it">aritmetica: tabelline, enumerazione, immagine speculare, allineare la bilancia, dare il resto, ...</li>
<li xml:lang="ko">산술 연산: 표 기억하기, 배열하기, 그림 뒤집기, 저울 맞추기, 거스름돈 계산하기, ...</li>
- <li xml:lang="ml">ഗണിതശാസ്ത്രം: പട്ടിക ഓർക്കാം, എണ്ണൽ, കണ്ണാടി ചിത്രം, തൂക്കമൊപ്പിക്കാം, ബാക്കി കൊടുക്കാം, ...</li>
+ <li xml:lang="mk">аритметика: меморија, набројување, отцртување слика, балансирање на вага, враќање кусур, ...</li>
+ <li xml:lang="ml">ഗണിതശാസ്ത്രം: പട്ടിക ഓർക്കാം, എണ്ണൽ, പ്രതിബിംബം, തൂക്കമൊപ്പിക്കാം, ബാക്കി കൊടുക്കാം, ...</li>
<li xml:lang="nl">rekenen: tafels oefenen, reeksen, afbeelding spiegelen, de schaal in evenwicht brengen, wisselgeld geven, ...</li>
<li xml:lang="nn">rekning: gongetabellen, teljing, spegelbilete, måling av vekt, vekslepengar, …</li>
<li xml:lang="pl">arytmetyka: tablice pamięciowe, wyliczanie, obraz lustrzany, wyrównoważanie wagi, wydawanie reszty, ...</li>
<li xml:lang="pt">aritmética: memória da tabuada, enumeração, imagem-espelho, equilíbrio de balanças, trocos, ...</li>
<li xml:lang="pt-BR">matemática: memória matemática, enumeração, imagens espelhadas, balanceamento de escalas, moedas e troco, ...</li>
<li xml:lang="ro">aritmetică: tabla înmulțirii, enumerări, imagini în oglindă, echilibrarea balanței, datul restului, ...</li>
<li xml:lang="ru">арифметика: игра «память» с подсчётом, счёт, отражение рисунка, уравновешивание весов, подсчёт сдачи, ...</li>
<li xml:lang="sk">aritmetické: tabuľková pamäť, výpočet, zrkalový obrázok, vyváženie mierky, zmena dávky...</li>
<li xml:lang="sl">računstvo: spomin z računi, štetje, uravnoteži tehtnico, vračanje drobiža, ...</li>
<li xml:lang="sv">aritmetik: tabellminne, uppräkning, spegelbild, balansera vågen, ge växel, ...</li>
<li xml:lang="tr">aritmetik: tablo belleği, numaralandırma, ayna görüntüsü, ölçeği dengelemek, para üstü, ...</li>
<li xml:lang="uk">Арифметика: запам’ятовування таблиць, нумерація, віддзеркалення, балансування масштабу, обчислення решти…</li>
<li xml:lang="x-test">xxarithmetic: table memory, enumeration, mirror image, balance the scale, change giving, ...xx</li>
<li xml:lang="zh-CN">算数:表格记忆、枚举、镜像、天平、找零……</li>
<li xml:lang="zh-TW">數學運算:表格記憶、列舉、影像映射、平衡、找零計算等</li>
<li>science: the canal lock, color mixing, gravity concept, ...</li>
<li xml:lang="ar">العلوم: قفل القناة ومزج الألوان ومفهوم الجاذبيّة وغيرها.</li>
+ <li xml:lang="br">Skiantoù : mont en-dro ur skluj, meskañ al livioù, meizad an nerzh-dedennañ, ...</li>
<li xml:lang="ca">ciència: blocar el canal, barreja de colors, el concepte de la gravetat...</li>
<li xml:lang="ca-valencia">ciència: blocar el canal, barreja de colors, el concepte de la gravetat...</li>
<li xml:lang="de">Wissenschaft: Kanalschleuse, Farbmischung, Gravitation,...</li>
<li xml:lang="el">επιστήμη: σύστημα αλλαγής στάθμης ροής, ανάμειξη χρωμάτων, η έννοια της βαρύτητας, ...</li>
<li xml:lang="en-GB">science: the canal lock, colour mixing, gravity concept, ...</li>
<li xml:lang="es">ciencia: la esclusa de un canal, mezcla de colores, concepto de gravedad...</li>
- <li xml:lang="et">loodusteadused: kanali lüüs, värvide segamine, gravitatsiooni mõistmine...</li>
+ <li xml:lang="et">loodusteadused: kanali lüüs, värvide segamine, gravitatsiooni mõistmine ...</li>
<li xml:lang="eu">zientzia: ubidearen uhatea, koloreak nahastea, grabitate kontzeptua, ...</li>
<li xml:lang="fi">tiede: kanavasulku, värien sekoitus, painovoiman käsite…</li>
<li xml:lang="fr">science : fonctionnement d'une écluse, mélange des couleurs, concept de la gravité…</li>
<li xml:lang="gl">Ciencia: o bloqueo da canle, mestura de cores, o concepto de gravidade, etc.</li>
<li xml:lang="hi">विज्ञान: नहर लॉक, रंग मिश्रण, गुरुत्वाकर्षण अवधारणा, ...</li>
<li xml:lang="id">ilmu pengetahuan: kunci kanal, pencampuran warna, konsep gravitasi, ...</li>
<li xml:lang="it">scienza: la chiusa del canale, miscelazione dei colori, il concetto di gravità, ...</li>
<li xml:lang="ko">과학: 운하 갑문, 색 섞기, 중력, ...</li>
- <li xml:lang="ml">ശാസ്ത്രം: കനാലിൻ്റെ പൂട്ട്, നിറം ചേർക്കാം, ഗുരുത്വം എന്ന ആശയം, ...</li>
+ <li xml:lang="mk">наука: заклучување на каналот, мешање на бои, концепт на гравитација, ...</li>
+ <li xml:lang="ml">ശാസ്ത്രം: കനാലിന്റെ പൂട്ട്, നിറം ചേർക്കാം, ഗുരുത്വം എന്ന ആശയം, ...</li>
<li xml:lang="nl">natuurkunde: de sluizen bedienen, mengen van kleuren, concept van zwaartekracht, ...</li>
<li xml:lang="nn">vitskap: kanalsluse, blanding av fargar, tyngdekraft, …</li>
<li xml:lang="pl">nauka: śluza na kanale, mieszanie barw, poczucie grawitacji, ...</li>
<li xml:lang="pt">ciência: bloqueio de canais, misturas de cores, conceito de gravidade, ...</li>
<li xml:lang="pt-BR">ciência: comporta de canal, mistura de cores, conceito de gravidade, ...</li>
<li xml:lang="ro">științe: ecluza unui canal, amestecul culorilor, conceptul de gravitație, ...</li>
<li xml:lang="ru">наука: работа судоходного шлюза, смешивание цветов, представление о гравитации, ...</li>
<li xml:lang="sk">veda: zamknutý kanál, miešanie farieb, koncept grvitácie...</li>
<li xml:lang="sl">znanost: zapornica kanala, mešanje barv, koncept težnosti ...</li>
<li xml:lang="sv">vetenskap: kanalslussen, färgblandning, gravitationskonceptet, ...</li>
<li xml:lang="tr">bilim: kanal kilidi, renk karışımı, yerçekimi kavramı, ...</li>
<li xml:lang="uk">Наука: шлюзування, змішування кольорів, поняття тяжіння…</li>
<li xml:lang="x-test">xxscience: the canal lock, color mixing, gravity concept, ...xx</li>
<li xml:lang="zh-CN">科学:运河闸门、颜料色彩混合、重力的概念……</li>
<li xml:lang="zh-TW">科學:顏色混合、重力觀念、運河鎖等等</li>
<li>games: memory, connect 4, tic tac toe, sudoku, hanoi tower, ...</li>
<li xml:lang="ar">الألعاب: الذاكرة و«وصّل ٤» و"إكس-أُو" و«سودوكو»، وبرج هانوي وغيرها.</li>
+ <li xml:lang="br">C'hoarioù : memor, pevar a-steud, tri merk a-steud, sudoku, tour Hanoi,…</li>
<li xml:lang="ca">jocs: memòria, connectar 4, tres en ratlla, sudoku, torre de Hanoi...</li>
<li xml:lang="ca-valencia">jocs: memòria, connectar 4, tres en ratlla, sudoku, torre de Hanoi...</li>
<li xml:lang="de">Spiele: Memory, Vier gewinnt, Tic-Tac-Toe, Sudoku, Türme von Hanoi,...</li>
<li xml:lang="el">παιχνίδια: μνήμη, τετράδες, τρίλιζα, σουντόκου, πύργος του Ανόι, ...</li>
<li xml:lang="en-GB">games: memory, connect 4, tic tac toe, sudoku, hanoi tower, ...</li>
<li xml:lang="es">juegos: memoria, conectar 4, tres en raya, sudoku, torres de hanoi...</li>
- <li xml:lang="et">mängud: mälu, nelja ühendamine, trips-traps-trull, sudoku, Hanoi tornid...</li>
- <li xml:lang="eu">jokoak: oroimena, konektatu 4, hirutan hiru, sudoku, hani dorrea, ...</li>
+ <li xml:lang="et">mängud: mälu, nelja ühendamine, trips-traps-trull, sudoku, Hanoi tornid ...</li>
+ <li xml:lang="eu">jokoak: oroimena, konektatu 4, hirutan hiru, sudoku, hanoi dorrea, ...</li>
<li xml:lang="fi">pelit: muisti, neljän suora, ristinolla, sudoku, Hanoin tornit…</li>
<li xml:lang="fr">jeux : trouve les paires, puissance 4, morpion, sudoku, la tour d'hanoï…</li>
<li xml:lang="gl">Xogos: memoria, conectar 4, pai nai fillo, sudoku, torre de Hanoi, etc.</li>
<li xml:lang="hi">खेल: स्मृति, कनेक्ट 4, टिक टैक टो , सुडोकू, हनोई टॉवर, ...</li>
<li xml:lang="id">permainan: ingatan, menyambungkan 4, tic tac toe, sudoku, menara hanoi, ...</li>
<li xml:lang="it">giochi: memory, forza 4, filetto, sudoku, torre di hanoi, ...</li>
<li xml:lang="ko">게임: 메모리 게임, 4개 연결하기, 삼목, 수도쿠, 하노이 탑, ...</li>
+ <li xml:lang="mk">игри: меморија, поврзи 4, икс и точка, судоку, ханој кула, ...</li>
<li xml:lang="ml">കളികൾ: ഓർമ്മ, 4 എണ്ണം ബന്ധിപ്പിക്കുക, ടിക് ടാക് ടോ, ഹാനോയിയുടെ ഗോപുരം, ...</li>
<li xml:lang="nl">spellen: geheugenspel, vier op een rij, boter kaas en eieren, sudoku, torens van hanoi, ...</li>
<li xml:lang="nn">spel: hugsespel, fire på rad, bondesjakk, sudoku, tårnet i Hanoi, …</li>
<li xml:lang="pl">gry: na pamięć, łączenie czwórek, tic tac toe, sudoku, wieża hanoi, ...</li>
<li xml:lang="pt">jogos: memória, 4 em linha, jogo do galo, sudoku, torres de Hanói, ...</li>
<li xml:lang="pt-BR">jogos: memória, ligue 4, jogo da velha, sudoku, torre de Hanói, ...</li>
<li xml:lang="ro">jocuri: memorie, leagă 4, X și 0, sudoku, turnul hanoi, ...</li>
<li xml:lang="ru">игры: память, соедини 4, крестики-нолики, судоку, Ханойская башня, ...</li>
<li xml:lang="sk">hry: pamäť, spojenie 4, tic tac toe, sudoku, hanojská veža...</li>
<li xml:lang="sl">igre: spomin, štiri v vrsto, križci in krožci, sudoku, Hanojski stolpi, ...</li>
<li xml:lang="sv">spel: memory, koppla 4, tre-i-rad, sudoku, tornen i Hanoi, ...</li>
<li xml:lang="tr">oyunlar: hafıza, dörtleme, üç taş, sudoku, hanoi kulesi, ...</li>
<li xml:lang="uk">Ігри: запам’ятовування, чотири-у-рядок, хрестики-нулики, судоку, ханойські вежі…</li>
<li xml:lang="x-test">xxgames: memory, connect 4, tic tac toe, sudoku, hanoi tower, ...xx</li>
<li xml:lang="zh-CN">游戏:记忆、四子棋、井子棋、数独、汉诺塔……</li>
<li xml:lang="zh-TW">遊戲:記憶遊戲、四子棋、井字遊戲、數獨、河內塔等等</li>
<li>reading: reading practice, ...</li>
<li xml:lang="ar">القراءة: ممارسة القراءة وغيرها.</li>
+ <li xml:lang="br">Lenn : pleustriñ war al lenn…</li>
<li xml:lang="ca">lectura: practicar la lectura...</li>
<li xml:lang="ca-valencia">lectura: practicar la lectura...</li>
<li xml:lang="de">Lesen: Leseübungen ...</li>
<li xml:lang="el">ανάγνωση: εξάσκηση στην ανάγνωση, ...</li>
<li xml:lang="en-GB">reading: reading practice, ...</li>
<li xml:lang="es">lectura: prácticas de lectura...</li>
- <li xml:lang="et">lugemine</li>
+ <li xml:lang="et">lugemine: lugemise harjutamine ...</li>
<li xml:lang="eu">irakurketa: irakurtzen trebatzea, ...</li>
<li xml:lang="fi">lukeminen: lukemisen harjoittelu…</li>
<li xml:lang="fr">lecture : entraînement à la lecture…</li>
<li xml:lang="gl">Lectura: práctica de lectura, etc.</li>
<li xml:lang="hi">पढ़ना: पढ़ना अभ्यास, ...</li>
<li xml:lang="id">membaca: latihan membaca, ...</li>
<li xml:lang="it">lettura: esercitare la lettura, ...</li>
<li xml:lang="ko">읽기: 읽기 연습, ...</li>
+ <li xml:lang="mk">читање: пракса за читање, ...</li>
<li xml:lang="ml">വായന: വായന പരിശീലനം, ...</li>
<li xml:lang="nl">lezen: lees oefening, ...</li>
<li xml:lang="nn">lesing: leseøvingar, …</li>
<li xml:lang="pl">czytanie: nauka czytania, ...</li>
<li xml:lang="pt">leitura: exercícios de leitura, ...</li>
<li xml:lang="pt-BR">leitura: prática de leitura, ...</li>
<li xml:lang="ro">citire: exerciții de citire, ...</li>
<li xml:lang="ru">чтение: упражнение в чтении, ...</li>
<li xml:lang="sk">čítanie: precvičovanie čítania...</li>
<li xml:lang="sl">branje: bralna vaja, ...</li>
<li xml:lang="sv">läsning: läsningsövning, ...</li>
<li xml:lang="tr">okuma: okuma egzersizi, ...</li>
<li xml:lang="uk">Читання: вправи із читання…</li>
<li xml:lang="x-test">xxreading: reading practice, ...xx</li>
<li xml:lang="zh-CN">阅读:阅读练习……</li>
<li xml:lang="zh-TW">閱讀:閱讀練習等等</li>
<li>other: learn to tell time, the braille system, maze, music
instruments, ...</li>
<li xml:lang="ar">أخرى: تعلّم قراءة الوقت ونظام «بريل» وألغاز متاهات والآلات الموسيقيّة وغيرها.</li>
+ <li xml:lang="br">A bep seurt : deskiñ reiñ an eur, meizad Braille, milendall, benvegoù sonerezh, ...</li>
<li xml:lang="ca">altres: aprendre a dir l'hora, el sistema braille, laberint, instruments musicals...</li>
<li xml:lang="ca-valencia">altres: aprendre a dir l'hora, el sistema braille, laberint, instruments musicals...</li>
<li xml:lang="de">Sonstiges: Uhrzeit, Braille-System, Labyrinthe, Musikinstrumente ...</li>
- <li xml:lang="el">άλλα: μαθαίνω να λέω την ώρα, το σύστημα braille, λαβύρινθος, μουσικά όργανα, ...</li>
+ <li xml:lang="el">άλλα: μαθαίνω να λέω την ώρα, το σύστημα μπράιγ, λαβύρινθος, μουσικά όργανα, ...</li>
<li xml:lang="en-GB">other: learn to tell time, the braille system, maze, music instruments, ...</li>
<li xml:lang="es">otras: aprender a decir la hora, el sistema braille, laberintos, instrumentos musicales...</li>
- <li xml:lang="et">muu: kellaaja väljendamine, Braille'i kiri, labürint, muusikariistad...</li>
+ <li xml:lang="et">muu: kellaaja väljendamine, Braille'i kiri, labürint, muusikariistad ...</li>
<li xml:lang="eu">bestelakoak: ikasi ordua esaten, braille sistema, labirintoa, musika tresnak, ...</li>
<li xml:lang="fi">muuta: kellonajan kertominen, Braille-järjestelmä, sokkelo, soittimet…</li>
<li xml:lang="fr">autre : apprendre à dire l'heure, le système braille, le labyrinthe, les instruments de musique…</li>
<li xml:lang="gl">Outros: aprender a dicir as horas, o sistema braille, labirinto, instrumentos musicais, etc.</li>
<li xml:lang="hi">अन्य: समय बताओ, ब्रेल प्रणाली, भूलभुलैया, संगीत वाद्ययंत्र, ...</li>
<li xml:lang="id">lainnya: belajar menceritakan waktu, sistem braille, labirin, alat musik, ...</li>
<li xml:lang="it">altro: impara a leggere l'ora, il sistema braille, labirinto, strumenti musicali, ...</li>
<li xml:lang="ko">기타: 시간 읽기, 점자, 미로, 악기, ...</li>
+ <li xml:lang="mk">друго: учење на часовник, учење на брајовиот систем, лавиринт, музички инструменти, ...</li>
<li xml:lang="ml">മറ്റുള്ളവ: സമയം പറയാൻ പഠിക്കാം, ബ്രായി ലിപി, കുടുക്കുവഴി, സംഗീതോപകരണങ്ങൾ, ...</li>
<li xml:lang="nl">overig: leren klokkijken, het braille-systeem, doolhof, muziekinstrumenten, ...</li>
<li xml:lang="nn">anna: lær klokka, lær blindeskrift, labyrint, musikkinstrument, …</li>
<li xml:lang="pl">inne: naucz się godzin na zegarze, systemu brajla, labiryntów, instrumentów muzycznych, ...</li>
<li xml:lang="pt">outros: aprender a dizer as horas, o sistema Braille, labirintos, instrumentos musicais, ...</li>
<li xml:lang="pt-BR">outros: aprendendo a ver as horas, o sistema Braille, labirintos, instrumentos musicais, ...</li>
<li xml:lang="ro">altele: învață să citești ceasul, sistemul braille, labirint, instrumente muzicale, ...</li>
<li xml:lang="ru">другое: определение времени по часам, шрифт Брайля, лабиринт, музыкальные инструменты, ...</li>
<li xml:lang="sk">iné: ako povedať čas, braillov systém, bludisko, hudobná nástroje...</li>
<li xml:lang="sl">ostalo: prepoznavanje časa, brajica, blodnjak, glasbila, ...</li>
<li xml:lang="sv">annat: lära sig klockan, punktskrift, labyrint, musikinstrument, ...</li>
<li xml:lang="tr">diğer: saati söylemeyi öğrenme, braille sistemi, labirent, müzik, enstrümanlar, ...</li>
<li xml:lang="uk">Інше: навчання позначенням часу, система Брайля, лабіринти, музичні інструменти…</li>
<li xml:lang="x-test">xxother: learn to tell time, the braille system, maze, music instruments, ...xx</li>
<li xml:lang="zh-CN">其他:学认钟表、盲文系统、迷宫、乐器……</li>
<li xml:lang="zh-TW">其他:看時間、點字系統、迷宮、認識樂器等等</li>
</ul>
<p>Currently GCompris offers in excess of 100 activities and more
are being developed. GCompris is free software, that means that
you can adapt it to your own needs, improve it and, most
importantly, share it with children everywhere.</p>
<p xml:lang="ar">في «فهمت» حاليًا أكثر من ١٠٠ نشاط وثمّة غيرها يجري تطويرها. «فهمت» برمجيّة حرّة، هذا يعني أنك تستطيع تطويعها حسب احتياجك، وكذلك تطويرها، والأهم من ذلك هو مشاركتها مع الأطفال في كل مكان.</p>
+ <p xml:lang="br">Evit ar poent e kinnig GCompris muioc'h eget 100 oberezh ha reoù all a zo war ar stern. Ur meziant digor eo GCompris, ar pezh a sinifi e c'heller azasaat anezhañ diouzh ezhommoù-mañ-ezhommoù, gwellaat anezhañ ha, pouezusosc'h c'hoazh, lakaat bugale d'ober gantañ ne vern pelec'h.</p>
<p xml:lang="ca">Actualment el GCompris ofereix més de 100 activitats i encara se'n desenvolupen més. El GCompris és programari lliure, el qual vol dir que podeu adaptar-lo a les vostres pròpies necessitats, millorar-lo i, el més important, compartir-lo amb infants de tot arreu.</p>
<p xml:lang="ca-valencia">Actualment el GCompris ofereix més de 100 activitats i encara se'n desenvolupen més. El GCompris és programari lliure, el qual vol dir que podeu adaptar-lo a les vostres pròpies necessitats, millorar-lo i, el més important, compartir-lo amb infants de tot arreu.</p>
<p xml:lang="de">Insgesamt beinhaltet GCompris mehr als 100 Aktivitäten und wird ständig weiterentwickelt. GCompris ist freie Software. Sie haben also die Möglichkeit, sie ihren Bedürfnissen anzupassen und zu verbessern, und gerne auch alle Kinder der Welt von Ihrer Arbeit profitieren zu lassen.</p>
<p xml:lang="el">Προς το παρόν το GCompris προσφέρει περισσότερες από 100 δραστηριότητες και αναπτύσσονται και άλλες. Το GCompris είναι ελεύθερο λογισμικό, το οποίο σημαίνει ότι μπορείτε να το προσαρμόσετε στις ανάγκες σας, να το βελτιώσετε, και, το σπουδαιότερο, να το μοιραστείτε με παιδιά από όλον τον κόσμο.</p>
<p xml:lang="en-GB">Currently GCompris offers in excess of 100 activities and more are being developed. GCompris is free software, that means that you can adapt it to your own needs, improve it and, most importantly, share it with children everywhere.</p>
<p xml:lang="es">En la actualidad, GCompris ofrece más de 100 actividades y hay muchas más en desarrollo. GCompris es software libre, lo que significa que puede adaptarlo a sus necesidades, mejorarlo y, lo que es más importante, compartirlo con los niños de todo el mundo.</p>
<p xml:lang="et">Praegu pakub GCompris üle 100 tegevuse ja neid tuleb aina juurde. GCompris on vaba tarkvara, mis tähendab, et seda saab kohandada oma vajadustele, täiustada, ja mis peamine, jagada oma täiustusi lastega kogu maailmas.</p>
<p xml:lang="eu">Gaur egun GCompris-ek 100 jardueratik gora eskaintzen ditu eta gehiago garatzen ari dira. GCompris software askea da, horrek esan nahi du zure beharretara egokitu dezakezula, hobetu dezakezula eta, garrantzitsuagoa dena, haurrekin partekatu dezakezu dauden lekuan daudela.</p>
<p xml:lang="fi">GComprisissa on nykyisellään yli sata toimintoa, ja lisää kehitetään. GCompris on vapaata ohjelmistoa, mikä tarkoittaa, että voit muokata sitä tarpeisiisi, parannella sitä ja mikä tärkeintä jakaa sitä lapsille kaikkialla.</p>
<p xml:lang="fr">Actuellement, GCompris contient plus de 100 activités et d'autres sont en cours de développement. GCompris est un logiciel libre, ce qui veut dire que vous pouvez l'adapter à vos propres besoins, le modifier et, le plus important, le partager avec des enfants où que ce soit.</p>
<p xml:lang="gl">Actualmente GCompris ofrece máis de 100 actividades e hai máis en desenvolvemento. GCompris é software libre, o que significa que pode adaptalo para axustalo ás súas necesidades, melloralo e, o máis importante, compartilo con nenos de todo o mundo.</p>
<p xml:lang="hi">वर्तमान में जी कॉम्पप्रस 100 गतिविधियों से अधिक प्रदान करता है और अधिक विकसित किए जा रहे हैं। जी कॉम्पप्रस मुफ्त सॉफ्टवेयर है, इसका मतलब है कि आप इसे अपनी आवश्यकताओं के अनुसार अनुकूलित कर सकते हैं, इसमें सुधार कर सकते हैं, और सबसे महत्वपूर्ण बात, इसे हर जगह बच्चों के साथ साझा कर सकते हैं।</p>
- <p xml:lang="id">Saat ini GCompris menawarkan lebih dari 100 aktivitas dan masih banyak lagi yang sedang dikembangkan. GCompris adalah software bebas, itu berarti kamu bisa menyesuaikannya dengan kebutuhanmu sendiri, memperbaikinya dan yang terpenting, bagikan dengan anak-anak di mana-mana.</p>
+ <p xml:lang="id">Saat ini GCompris menawarkan lebih dari 100 aktivitas dan masih banyak lagi yang sedang dikembangkan. GCompris adalah perangkat lunak bebas, itu berarti kamu bisa menyesuaikannya dengan kebutuhanmu sendiri, memperbaikinya dan yang terpenting, bagikan dengan anak-anak di mana-mana.</p>
<p xml:lang="it">Attualmente GCompris offre più di 100 attività e altre sono in fase di sviluppo. GCompris è software libero, che significa che puoi adattarlo alle tue necessità, migliorarlo e, cosa più importante, condividerlo con tutti i bambini.</p>
<p xml:lang="ko">GCompris는 100개 이상의 활동을 포함하고 있으며 더 많은 활동을 개발하고 있습니다. GCompris는 자유 소프트웨어이며, 필요에 따라서 활동을 개선할 수 있으며 전 세계의 사람들과 공유할 수 있습니다.</p>
- <p xml:lang="ml">ഇപ്പോൾ ജികോംപ്രിയിൽ 100 ലധികം പ്രവർത്തനങ്ങൾ ഉണ്ട്, അതിൽ കൂടുതൽ ഡെവലപ്പ് ചെയ്തുകൊണ്ടിരിക്കുന്നുമുണ്ട്. ജികോംപ്രി ഒരു സ്വതന്ത്ര സോഫ്റ്റുവെയർ ആണ്, അതായത് നിങ്ങൾക്ക് അതിനെ നിങ്ങളുടെ ആവശ്യങ്ങൾക്കനുസരിച്ച് രൂപപ്പെടുത്താം, അതിനെ മെച്ചപ്പെടുത്താം, ഏറ്റവും പ്രധാനമായി, എല്ലായിടങ്ങളിലുള്ള കുട്ടികളുമായി അത് പങ്കുവെയ്ക്കാം.</p>
+ <p xml:lang="mk">Во моментов, Жикомпри нуди повеќе од 100 активности и уште се развиваат. Жикомпри е слободен софтвер, тоа значи дека можете да го прилагодите на вашите сопствени потреби, да го подобрите и што е најважно, да го споделите со децата секаде.</p>
+ <p xml:lang="ml">ജികോംപ്രിയിൽ ഇപ്പോൾ 100-ലധികം പ്രവർത്തനങ്ങൾ ഉണ്ട്, കൂടുതൽ ഡെവലപ്പു ചെയ്തുകൊണ്ടിരിക്കുന്നുമുണ്ട്. ജികോംപ്രി ഒരു സ്വതന്ത്ര സോഫ്റ്റ്‍വെയർ ആണ്, അതായത് താങ്കൾക്ക് അതിനെ താങ്കളുടെ ആവശ്യങ്ങൾക്കനുസരിച്ച് രൂപപ്പെടുത്താം, മെച്ചപ്പെടുത്താം, ഏറ്റവും പ്രധാനമായി, ലോകമെമ്പാടുമുള്ള കുട്ടികളുമായും അതു പങ്കുവെയ്ക്കാം.</p>
<p xml:lang="nl">Op dit moment biedt GCompris meer dan 100 activiteiten en meer zijn er in ontwikkeling. GCompris is vrije software, dat betekent dat u het kunt aanpassen aan uw eigen behoeften, het verbeteren en, meest belangrijk, het met kinderen overal kun delen.</p>
<p xml:lang="nn">GCompris har over 100 aktivitetar, og fleire vert utvikla. GCompris er fri programvare. Det vil seia at du kan tilpassa spelet slik du ønskjer, forbetra det og dela det med ungar i heile verda.</p>
<p xml:lang="pl">Obecnie GCompris zapewnia ponad 100 aktywności, a jeszcze więcej jest opracowywanych. GCompris jest darmowym oprogramowaniem, co oznacza, że możesz je dopasować do własnych potrzeb, ulepszać je i co najważniejsze udostępniać je dzieciom.</p>
<p xml:lang="pt">De momento, o GCompris oferece mais de 100 actividades, estando ainda mais em desenvolvimento. O GCompris é uma aplicação de 'software' livre, o que significa que o poderá adaptar às suas próprias necessidades, melhorá-lo e, o mais importante, partilhá-lo com as crianças em todo o lado.</p>
<p xml:lang="pt-BR">Atualmente o GCompris oferece mais de 100 atividades e outras mais estão sendo desenvolvidas. O GCompris é um software livre, o que significa que você pode adaptá-lo para as suas próprias necessidades, melhorá-lo e, mais importante, compartilhar com as crianças de todo o mundo.</p>
<p xml:lang="ro">Momentan GCompris oferă peste 100 de activități și multe altele sunt în lucru. GCompris este software liber, ceea ce înseamnă că poate fi adaptat nevoilor dumneavoastră, îmbunătățit, dar mai ales, partajat cu copii de pretutindeni.</p>
<p xml:lang="ru">В настоящее время GCompris содержит более 100 упражнений, и новые находятся в разработке. GCompris — свободное ПО, и это значит, что вы можете приспособить его для своих нужд, улучшить, а самое главное — поделиться им с детьми во всём мире.</p>
<p xml:lang="sk">Aktuálne GCompris ponúka vyše 100 aktivít a ďalšie sa vyvíjajú. GCompris je slobodný softvér, čo znamená, že si ho môžete prispôsobiť na vlastné potreby, zlepšiť, a hlavne zdieľať s deťmi všade.</p>
<p xml:lang="sl">GCompris trenutno ponuja več kot 100 dejavnosti, še več pa jih je v razvoju. GCompris je prosta programska oprema, kar pomeni, da jo lahko prilagodite po svoje, še pomembneje pa je, da jo lahko delite z otroki širom sveta.</p>
<p xml:lang="sv">För närvarande erbjuder GCompris över 100 aktiviteter och ännu fler håller på att utvecklas. GCompris är fri programvara, vilket betyder att man kan anpassa det till sina egna behov, och viktigast av allt, dela det med barn överallt.</p>
<p xml:lang="tr">Şu anda GCompris 100'den fazla etkinlik sunuyor ve daha fazlasını geliştiriliyor. GCompris bir özgür yazılımdır; bu, onu kendi ihtiyaçlarınıza uyarlayabilir, geliştirebilir ve en önemlisi, her yerde çocuklarla paylaşabileceğiniz anlamına gelir.</p>
<p xml:lang="uk">У поточній версії GCompris понад 100 вправ. Розробники постійно працюють над новими вправами. GCompris є вільним програмним забезпеченням, це означає, що ви можете адаптувати програму до власних потреб, покращувати її і, що найважливіше, ділитися вашими творіннями із усіма дітьми.</p>
<p xml:lang="x-test">xxCurrently GCompris offers in excess of 100 activities and more are being developed. GCompris is free software, that means that you can adapt it to your own needs, improve it and, most importantly, share it with children everywhere.xx</p>
<p xml:lang="zh-CN">当前 GCompris 提供超过100个活动,还有更多的正在开发中。GCompris 是自由软件,这意味着您可以根据您的需要进行调整、改进,以及最重要的一点,和世界各地的孩子们分享。</p>
<p xml:lang="zh-TW">目前 GCompris 提供超過 100 個遊戲,還有更多正在開發中。GCompris 是一套自由軟體,表示您可以根據您自己的需求來改進,並分享給所有的孩子們。</p>
</description>
<screenshots>
<screenshot type="default">
<caption>GCompris main menu</caption>
<caption xml:lang="ar">قائمة «فهمت» الرئيسيّة</caption>
+ <caption xml:lang="br">Lañser pennañ GCompris</caption>
<caption xml:lang="ca">Menú principal del GCompris</caption>
<caption xml:lang="ca-valencia">Menú principal del GCompris</caption>
<caption xml:lang="cs">Hlavní nabídka GCompris</caption>
<caption xml:lang="de">GCompris-Hauptmenü</caption>
<caption xml:lang="el">Κύριο μενού του GCompris</caption>
<caption xml:lang="en-GB">GCompris main menu</caption>
<caption xml:lang="es">Menú principal de GCompris</caption>
+ <caption xml:lang="et">GComprise peamenüü</caption>
<caption xml:lang="eu">GCompris menu nagusia</caption>
<caption xml:lang="fi">GComprisin päävalikko</caption>
<caption xml:lang="fr">Menu principal de GCompris</caption>
<caption xml:lang="gl">Menú principal de GCompris</caption>
+ <caption xml:lang="id">Menu utama GCompris</caption>
<caption xml:lang="it">Menu principale di GCompris</caption>
+ <caption xml:lang="ko">GCompris 주 메뉴</caption>
+ <caption xml:lang="mk">Жикомпри главно мени</caption>
<caption xml:lang="ml">ജികോംപ്രി പ്രധാന മെനു</caption>
<caption xml:lang="nl">GCompris-hoofdmenu</caption>
<caption xml:lang="nn">Hovudmenyen i GCompris</caption>
<caption xml:lang="pl">Główne menu GCompris</caption>
<caption xml:lang="pt">Menu principal do GCompris</caption>
<caption xml:lang="pt-BR">Menu principal do GCompris</caption>
<caption xml:lang="ro">Meniul principal GCompris</caption>
+ <caption xml:lang="ru">Главное меню GCompris</caption>
+ <caption xml:lang="sk">Hlavná ponuka GCompris</caption>
<caption xml:lang="sv">GCompris-huvudmeny</caption>
<caption xml:lang="uk">Головне меню GCompris</caption>
<caption xml:lang="x-test">xxGCompris main menuxx</caption>
<caption xml:lang="zh-TW">GCompris 主畫面</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/main_menu.png</image>
+ <image width="1080" height="720">https://cdn.kde.org/screenshots/gcompris/gcompris.png</image>
</screenshot>
<screenshot>
<caption>"Click on an uppercase letter" activity</caption>
+ <caption xml:lang="br">Obererezh "Klik war ur bennlizherenn"</caption>
<caption xml:lang="ca">Activitat «Fes clic en una lletra en majúscula»</caption>
<caption xml:lang="ca-valencia">Activitat «Fes clic en una lletra en majúscula»</caption>
<caption xml:lang="cs">Aktivita "Klikni na velké písmeno"</caption>
<caption xml:lang="el">Δραστηριότητα "Κλικ σε κεφαλαίο γράμμα"</caption>
<caption xml:lang="en-GB">"Click on an uppercase letter" activity</caption>
<caption xml:lang="es">Actividad «Pulsa en una letra mayúscula»</caption>
+ <caption xml:lang="et">"Klõpsa suurtähel" tegevus</caption>
<caption xml:lang="eu">"Egin klik letra larri batean" jarduera</caption>
<caption xml:lang="fi">”Napsauta suuraakkosta” -toiminto</caption>
<caption xml:lang="fr">L'activité « Trouver la lettre majuscule »</caption>
<caption xml:lang="gl">Actividade de «Premer unha letra maiúscula»</caption>
+ <caption xml:lang="id">Aktivitas "Klik pada huruf kapital"</caption>
<caption xml:lang="it">Attività «Fai clic su una lettera maiuscola»</caption>
+ <caption xml:lang="ko">"대문자 누르기" 활동</caption>
+ <caption xml:lang="mk">"Кликнете на голема буква" активност</caption>
<caption xml:lang="ml">"ഒരു വലിയ അക്ഷരത്തിൽ ക്ലിക്ക് ചെയ്യുക" പ്രവർത്തനം</caption>
<caption xml:lang="nl">"Click op een hoofdletter" activiteit</caption>
<caption xml:lang="nn">Aktiviteten «Trykk på ein stor bokstav»</caption>
<caption xml:lang="pl">Aktywność "klikania na wielkie litery"</caption>
<caption xml:lang="pt">Actividade para "Carregar numa letra maiúscula"</caption>
<caption xml:lang="pt-BR">Atividade "Clique em uma letra maiúscula"</caption>
<caption xml:lang="ro">Activitatea "Clic pe o literă mare"</caption>
+ <caption xml:lang="sk">Aktivita "Kliknúť na veľké písmeno"</caption>
<caption xml:lang="sv">Aktiviteten "Klicka på en stor bokstav"</caption>
<caption xml:lang="uk">Вправа «Клацніть на великій літері»</caption>
<caption xml:lang="x-test">xx"Click on an uppercase letter" activityxx</caption>
<caption xml:lang="zh-TW">「在大寫字母上按一下」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/click_on_letter_up.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/click_on_letter_up.png</image>
</screenshot>
<screenshot>
<caption>"Learning Clock" activity</caption>
+ <caption xml:lang="br">Obererezh "Horolajoù"</caption>
<caption xml:lang="ca">Activitat «Rellotge d'aprenentatge»</caption>
<caption xml:lang="ca-valencia">Activitat «Rellotge d'aprenentatge»</caption>
<caption xml:lang="cs">Aktivita "Nauč se hodiny"</caption>
<caption xml:lang="el">Δραστηριότητα "Ρολόι"</caption>
<caption xml:lang="en-GB">"Learning Clock" activity</caption>
<caption xml:lang="es">Actividad «Juego del reloj»</caption>
+ <caption xml:lang="et">"Õpi kella tundma" tegevus</caption>
<caption xml:lang="eu">"Erlojua ezagutzea" jarduera</caption>
<caption xml:lang="fi">”Kellon oppiminen” -toiminto</caption>
<caption xml:lang="fr">L'activité « Trouver l'heure »</caption>
<caption xml:lang="gl">Actividade de «Aprender o reloxo»</caption>
+ <caption xml:lang="id">Aktivitas "Mempelajari Jam"</caption>
<caption xml:lang="it">Attività «Impara l'orologio»</caption>
- <caption xml:lang="ml">"സമയം പഠിക്കൽ" പ്രവർത്തനം</caption>
+ <caption xml:lang="ko">"시계 익히기" 활동</caption>
+ <caption xml:lang="mk">"Учење на часовникот" активност</caption>
+ <caption xml:lang="ml">"ക്ലോക്ക് പഠനം" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Leren klok kijken</caption>
<caption xml:lang="nn">Aktiviteten «Lær klokka»</caption>
<caption xml:lang="pl">Aktywność "nauki zegara"</caption>
<caption xml:lang="pt">Actividade para "Descobrir o Relógio"</caption>
<caption xml:lang="pt-BR">Atividade "O Relógio"</caption>
<caption xml:lang="ro">Activitatea de "Învățarea ceasului clasic"</caption>
+ <caption xml:lang="sk">Aktivita "Učenie hodín"</caption>
<caption xml:lang="sv">Aktiviteten "Lära sig klockan"</caption>
<caption xml:lang="uk">Вправа «Вивчення годинника»</caption>
<caption xml:lang="x-test">xx"Learning Clock" activityxx</caption>
<caption xml:lang="zh-TW">「學習時鐘」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/clockgame.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/clockgame.png</image>
</screenshot>
<screenshot>
<caption>"Mixing color of paint" activity</caption>
+ <caption xml:lang="br">Obererezh "Kemmeskañ livioù pentur"</caption>
<caption xml:lang="ca">Activitat «Barreja els colors de la pintura»</caption>
<caption xml:lang="ca-valencia">Activitat «Barreja els colors de la pintura»</caption>
<caption xml:lang="cs">Aktivita "Míchání tiskařských barev"</caption>
<caption xml:lang="el">Δραστηριότητα "Μείξη χρωμάτων"</caption>
<caption xml:lang="en-GB">"Mixing colour of paint" activity</caption>
<caption xml:lang="es">Actividad «Mezcla de colores»</caption>
+ <caption xml:lang="et">"Sega värve" tegevus</caption>
<caption xml:lang="eu">"Margo koloreak nahastea" jarduera</caption>
<caption xml:lang="fi">”Värien sekoitus” -toiminto</caption>
<caption xml:lang="fr">L'activité « Mélange de la couleur de peinture »</caption>
<caption xml:lang="gl">Actividade de «Mesturar a cor da pintura»</caption>
+ <caption xml:lang="id">Aktivitas "Mencampur warna cat"</caption>
<caption xml:lang="it">Attività «Miscela la vernice colorata»</caption>
- <caption xml:lang="ml">"ചായത്തിൻ്റെ നിറങ്ങൾ കൂട്ടിക്കലർത്താം" പ്രവർത്തനം</caption>
+ <caption xml:lang="ko">"물감 색 섞기" 활동</caption>
+ <caption xml:lang="mk">"Мешање на бои" активност</caption>
+ <caption xml:lang="ml">"ചായത്തിന്റെ നിറങ്ങൾ കൂട്ടിക്കലർത്താം" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Verfkleuren mengen"</caption>
<caption xml:lang="nn">Aktiviteten «Blanda målingsfargar»</caption>
<caption xml:lang="pl">Aktywność "mieszania barw"</caption>
<caption xml:lang="pt">Actividade para "Misturar a cor das tintas"</caption>
<caption xml:lang="pt-BR">Atividade "Mistura de tintas coloridas"</caption>
<caption xml:lang="ro">Activitatea "Amestecul culorilor din vopsea"</caption>
+ <caption xml:lang="sk">Aktivita "Miešanie farieb maľby"</caption>
<caption xml:lang="sv">Aktiviteten "Blanda målarfärger"</caption>
<caption xml:lang="uk">Вправа «Змішування кольорів малюнка»</caption>
<caption xml:lang="x-test">xx"Mixing color of paint" activityxx</caption>
<caption xml:lang="zh-TW">「混合顏色」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/color_mix.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/color_mix.png</image>
</screenshot>
<screenshot>
<caption>"Colors" activity</caption>
+ <caption xml:lang="br">Obererezh "Livioù"</caption>
<caption xml:lang="ca">Activitat «Colors»</caption>
<caption xml:lang="ca-valencia">Activitat «Colors»</caption>
<caption xml:lang="cs">Aktivita "Barvy"</caption>
<caption xml:lang="el">Δραστηριότητα "Χρώματα"</caption>
<caption xml:lang="en-GB">"Colours" activity</caption>
<caption xml:lang="es">Actividad «Colores»</caption>
+ <caption xml:lang="et">"Värvide" tegevus</caption>
<caption xml:lang="eu">"Koloreak" jarduera</caption>
<caption xml:lang="fi">”Värit”-toiminto</caption>
<caption xml:lang="fr">L'activité « Trouver la couleur »</caption>
<caption xml:lang="gl">Actividade de «Cores»</caption>
+ <caption xml:lang="id">Aktivitas "Mewarnai"</caption>
<caption xml:lang="it">Attività «Colori»</caption>
+ <caption xml:lang="ko">"색깔" 활동</caption>
+ <caption xml:lang="mk">"Бои" активност</caption>
<caption xml:lang="ml">"നിറങ്ങൾ" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Kleuren"</caption>
<caption xml:lang="nn">Aktiviteten «Fargar»</caption>
<caption xml:lang="pl">Aktywność "barw"</caption>
<caption xml:lang="pt">Actividade de "Cores"</caption>
<caption xml:lang="pt-BR">Atividade "Cores"</caption>
<caption xml:lang="ro">Activitatea "Culorile"</caption>
+ <caption xml:lang="sk">Aktivita "Farby"</caption>
<caption xml:lang="sv">Aktiviteten "Färger"</caption>
<caption xml:lang="uk">Вправа з кольорами</caption>
<caption xml:lang="x-test">xx"Colors" activityxx</caption>
<caption xml:lang="zh-TW">「顏色」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/colors.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/colors.png</image>
</screenshot>
<screenshot>
<caption>"Build the same model" activity</caption>
+ <caption xml:lang="br">Obererezh "Krou ar memes skouer"</caption>
<caption xml:lang="ca">Activitat «Construeix el mateix model»</caption>
<caption xml:lang="ca-valencia">Activitat «Construeix el mateix model»</caption>
<caption xml:lang="cs">Aktivita "Postav stejný model"</caption>
<caption xml:lang="el">Δραστηριότητα "Φτιάξε το ίδιο"</caption>
<caption xml:lang="en-GB">"Build the same model" activity</caption>
<caption xml:lang="es">Actividad «Grúa»</caption>
+ <caption xml:lang="et">"Ehita samasugune mudel" tegevus</caption>
<caption xml:lang="eu">"Eraiki eredu bera" jarduera</caption>
<caption xml:lang="fi">”Rakenna sama malli” -toiminto</caption>
<caption xml:lang="fr">L'activité « Reconstruire le modèle »</caption>
<caption xml:lang="gl">Actividade de «Constrúe o mesmo modelo»</caption>
+ <caption xml:lang="id">Aktivitas "Bangun model yang sama"</caption>
<caption xml:lang="it">Attività «Costruisci lo stesso modello»</caption>
- <caption xml:lang="ml">"മാതൃക പോലെ നിർമ്മിക്കുക " പ്രവർത്തനം</caption>
+ <caption xml:lang="ko">"같은 모델 만들기" 활동</caption>
+ <caption xml:lang="mk">"Изградете го истиот модел" активност</caption>
+ <caption xml:lang="ml">"മാതൃക പോലെ നിർമ്മിക്കുക" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Bouw hetzelfde model"</caption>
<caption xml:lang="nn">Aktiviteten «Bygg opp modellen»</caption>
<caption xml:lang="pl">Aktywność "zbudowania tego samego modelu"</caption>
<caption xml:lang="pt">Actividade para "Construir o mesmo modelo"</caption>
<caption xml:lang="pt-BR">Atividade "Construa o mesmo modelo"</caption>
<caption xml:lang="ro">Activitatea "Construiește același model"</caption>
+ <caption xml:lang="sk">Aktivita "Postaviť rovnaký model"</caption>
<caption xml:lang="sv">Aktiviteten "Bygg samma modell"</caption>
<caption xml:lang="uk">Вправа «Відтворіть модель»</caption>
<caption xml:lang="x-test">xx"Build the same model" activityxx</caption>
<caption xml:lang="zh-TW">「建立相同的模型」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/crane.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/crane.png</image>
</screenshot>
<screenshot>
<caption>"Count the items" activity</caption>
+ <caption xml:lang="br">Obererezh "Kont an traoù"</caption>
<caption xml:lang="ca">Activitat «Compta els elements»</caption>
<caption xml:lang="ca-valencia">Activitat «Compta els elements»</caption>
<caption xml:lang="cs">Aktivita "Spočítej položky"</caption>
<caption xml:lang="el">Δραστηριότητα "Μέτρα τα αντικείμενα"</caption>
<caption xml:lang="en-GB">"Count the items" activity</caption>
<caption xml:lang="es">Actividad «Enumeración»</caption>
+ <caption xml:lang="et">"Loe esemed kokku" tegevus</caption>
<caption xml:lang="eu">"Zenbatu elementuak" jarduera</caption>
<caption xml:lang="fi">”Laske kohteet” -toiminto</caption>
<caption xml:lang="fr">L'activité « Compter les éléments »</caption>
<caption xml:lang="gl">Actividade de «Contar os elementos»</caption>
+ <caption xml:lang="id">Aktivitas "Menghitung benda"</caption>
<caption xml:lang="it">Attività «Conta gli oggetti»</caption>
+ <caption xml:lang="ko">"물건 개수 세기" 활동</caption>
+ <caption xml:lang="mk">"Изброј ги предметите" активност</caption>
<caption xml:lang="ml">"എത്രയെണ്ണം?" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Tel het aantal items"</caption>
<caption xml:lang="nn">Aktiviteten «Tel gjenstandane»</caption>
<caption xml:lang="pl">Aktywność "zliczania elementów"</caption>
<caption xml:lang="pt">Actividade para "Contar os itens"</caption>
<caption xml:lang="pt-BR">Atividade "Contagem de itens"</caption>
<caption xml:lang="ro">Activitatea "Numără elementele"</caption>
+ <caption xml:lang="sk">Aktivita "Počítať položky"</caption>
<caption xml:lang="sv">Aktiviteten "Räkna sakerna"</caption>
<caption xml:lang="uk">Вправа «Порахувати предмети»</caption>
<caption xml:lang="x-test">xx"Count the items" activityxx</caption>
<caption xml:lang="zh-TW">「數一數物品」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/enumerate.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/enumerate.png</image>
</screenshot>
<screenshot>
<caption>"The fifteen game" activity</caption>
+ <caption xml:lang="br">Obererezh "Ar miltamm lec'h-dilec'h"</caption>
<caption xml:lang="ca">Activitat «El joc dels quinze»</caption>
<caption xml:lang="ca-valencia">Activitat «El joc dels quinze»</caption>
<caption xml:lang="cs">Aktivita "Hra patnáct"</caption>
<caption xml:lang="el">Δραστηριότητα "Δεκαπέντε"</caption>
<caption xml:lang="en-GB">"The fifteen game" activity</caption>
<caption xml:lang="es">Actividad «Quince»</caption>
+ <caption xml:lang="et">"Viieteistkümnemängu" tegevus</caption>
<caption xml:lang="eu">"Hamabosteko jokoa" jarduera</caption>
<caption xml:lang="fr">L'activité « Le jeu du taquin »</caption>
<caption xml:lang="gl">Actividade de «O xogo dos quince»</caption>
+ <caption xml:lang="id">Aktivitas "Permainan lima belas"</caption>
<caption xml:lang="it">Attività «Il gioco del quindici»</caption>
+ <caption xml:lang="ko">"15 게임" 활동</caption>
+ <caption xml:lang="mk">"Петнаесеттата игра" активност</caption>
<caption xml:lang="ml">"പതിനഞ്ചിന്റെ കളി" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Het vijftien-spel"</caption>
<caption xml:lang="nn">Aktiviteten «Spelet 15»</caption>
<caption xml:lang="pl">Aktywność "gra w piętnaście"</caption>
<caption xml:lang="pt">Actividade do "Jogo dos quinze"</caption>
<caption xml:lang="pt-BR">Atividade "O jogo do quinze"</caption>
<caption xml:lang="ro">Activitatea "Jocul de cincisprezece"</caption>
+ <caption xml:lang="sk">Aktivita "Hra pätnásť"</caption>
<caption xml:lang="sv">Aktiviteten "Femtonspel"</caption>
<caption xml:lang="uk">Вправа «Гра „П'ятнадцять“»</caption>
<caption xml:lang="x-test">xx"The fifteen game" activityxx</caption>
<caption xml:lang="zh-TW">「遊戲十五」</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/fifteen.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/fifteen.png</image>
</screenshot>
<screenshot>
<caption>"Hexagon" activity</caption>
+ <caption xml:lang="br">Obererezh "C'hwec'hkorn"</caption>
<caption xml:lang="ca">Activitat «Hexàgon»</caption>
<caption xml:lang="ca-valencia">Activitat «Hexàgon»</caption>
<caption xml:lang="cs">Aktivita "Hexagon"</caption>
<caption xml:lang="el">Δραστηριότητα "Εξάγωνο"</caption>
<caption xml:lang="en-GB">"Hexagon" activity</caption>
<caption xml:lang="es">Actividad «Hexágono»</caption>
+ <caption xml:lang="et">"Kuusnurga" tegevus</caption>
<caption xml:lang="eu">"Hexagonoa" jarduera</caption>
<caption xml:lang="fr">L'activité « Localiser la fraise »</caption>
<caption xml:lang="gl">Actividade de «Hexágono»</caption>
+ <caption xml:lang="id">Aktivitas "Segi Enam"</caption>
<caption xml:lang="it">Attività «Esagono»</caption>
+ <caption xml:lang="ko">"육각형" 활동</caption>
+ <caption xml:lang="mk">"Шестаголник" активност</caption>
<caption xml:lang="ml">"ഷഡ്ഭുജം" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Hexagon"</caption>
<caption xml:lang="nn">Aktiviteten «Heksagon»</caption>
<caption xml:lang="pl">Aktywność "sześciokąta"</caption>
<caption xml:lang="pt">Actividade de "Hexágono"</caption>
<caption xml:lang="pt-BR">Atividade "Hexágono"</caption>
<caption xml:lang="ro">Activitatea "Hexagonul"</caption>
+ <caption xml:lang="sk">Aktivita "Hexagón"</caption>
<caption xml:lang="sv">Aktiviteten "Hexagon"</caption>
<caption xml:lang="uk">Вправа «Шестикутник»</caption>
<caption xml:lang="x-test">xx"Hexagon" activityxx</caption>
<caption xml:lang="zh-TW">「六角形」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/hexagon.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/hexagon.png</image>
</screenshot>
<screenshot>
<caption>"Balance the scales properly" activity</caption>
+ <caption xml:lang="br">Obererezh "Pouezerez Roberval"</caption>
<caption xml:lang="ca">Activitat «Equilibra correctament la balança»</caption>
<caption xml:lang="ca-valencia">Activitat «Equilibra correctament la balança»</caption>
<caption xml:lang="cs">Aktivita "Správně vyrovnat váhy"</caption>
<caption xml:lang="el">Δραστηριότητα "Ισορρόπησε τη ζυγαριά"</caption>
<caption xml:lang="en-GB">"Balance the scales properly" activity</caption>
<caption xml:lang="es">Actividad «Balanzas»</caption>
+ <caption xml:lang="et">"Kaalud tasakaalu" tegevus</caption>
<caption xml:lang="eu">"Orekatu balantzak behar bezala" jarduera</caption>
<caption xml:lang="fi">”Tasapainota vaaka oikein” -toiminto</caption>
<caption xml:lang="fr">L'activité « Trouver le poids »</caption>
<caption xml:lang="gl">Actividade de «Equilibra a balanza de forma axeitada»</caption>
+ <caption xml:lang="id">Aktivitas "Seimbangkan timbangan"</caption>
<caption xml:lang="it">Attività «Allinea correttamente i piatti della bilancia»</caption>
+ <caption xml:lang="ko">"저울 균형 맞추기" 활동</caption>
+ <caption xml:lang="mk">"Мерење со вага" активност</caption>
<caption xml:lang="ml">"തട്ടുകളിലെ തൂക്കമൊപ്പിക്കൂ" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Breng de weegschaal in evenwicht"</caption>
<caption xml:lang="nn">Aktiviteten «Få vekta i likevekt»</caption>
<caption xml:lang="pl">Aktywność "zrównoważenia skal"</caption>
<caption xml:lang="pt">Actividade para "Equilibrar as balanças adequadamente"</caption>
<caption xml:lang="pt-BR">Atividade "Equilibre a balança"</caption>
<caption xml:lang="ro">Activitatea "Echilibrează balanța"</caption>
+ <caption xml:lang="sk">Aktivita "Vyvážiť správne váhy"</caption>
<caption xml:lang="sv">Aktiviteten "Balansera vågen rätt"</caption>
<caption xml:lang="uk">Вправа «Рівновага на вагах»</caption>
<caption xml:lang="x-test">xx"Balance the scales properly" activityxx</caption>
<caption xml:lang="zh-TW">「讓天平平衡」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/scalesboard.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/scalesboard.png</image>
</screenshot>
<screenshot>
<caption>"End of chess game" activity</caption>
+ <caption xml:lang="br">Obererezh "Dibenn an echedoù"</caption>
<caption xml:lang="ca">Activitat «Final de la partida d'escacs»</caption>
<caption xml:lang="ca-valencia">Activitat «Final de la partida d'escacs»</caption>
<caption xml:lang="cs">Aktivita "Konec šachové partie"</caption>
<caption xml:lang="el">Δραστηριότητα "Το σκάκι στο τέλος"</caption>
<caption xml:lang="en-GB">"End of chess game" activity</caption>
<caption xml:lang="es">Actividad «Final de partida de ajedrez»</caption>
+ <caption xml:lang="et">"Male lõppmängu" tegevus</caption>
<caption xml:lang="eu">"Xake jokoaren amaierako zatia" jarduera</caption>
<caption xml:lang="fi">”Šakin loppupeli” -toiminto</caption>
<caption xml:lang="fr">L'activité « Le jeu des échecs »</caption>
<caption xml:lang="gl">Actividade de «Final dunha partida de xadrez»</caption>
+ <caption xml:lang="id">Aktivitas "Akhir dari permainan catur"</caption>
<caption xml:lang="it">Attività «Fine della partita a scacchi»</caption>
+ <caption xml:lang="ko">"체스 게임" 활동</caption>
+ <caption xml:lang="mk">"Крај на шаховска игра" активност</caption>
<caption xml:lang="ml">"ചെസ്സു കളിയുടെ അവസാനം" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Eindspel van schaken"</caption>
<caption xml:lang="nn">Aktiviteten «Sluttspel i sjakk»</caption>
<caption xml:lang="pl">Aktywność "zakończeń partii szachowych"</caption>
<caption xml:lang="pt">Actividade de "Fim de jogo de xadrez"</caption>
<caption xml:lang="pt-BR">Atividade "Finalize o jogo de xadrez"</caption>
<caption xml:lang="ro">Activitatea "Sfârșitul jocului de șah"</caption>
+ <caption xml:lang="sk">Aktivita "Koniec šachovej hry"</caption>
<caption xml:lang="sv">Aktiviteten "Slutspel i schack"</caption>
<caption xml:lang="uk">Вправа «Завершення гри у шахи»</caption>
<caption xml:lang="x-test">xx"End of chess game" activityxx</caption>
<caption xml:lang="zh-TW">「西洋棋殘局」遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/chess_partyend.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/chess_partyend.png</image>
</screenshot>
<screenshot>
<caption>"A sliding-block puzzle game" activity</caption>
+ <caption xml:lang="br">Obererezh "Torr-penn ar parkva"</caption>
<caption xml:lang="ca">Activitat «Un joc de trencaclosques amb blocs que es desplacen»</caption>
<caption xml:lang="ca-valencia">Activitat «Un joc de trencaclosques amb blocs que es desplacen»</caption>
<caption xml:lang="cs">Aktivita "Hra s posouváním bloků"</caption>
<caption xml:lang="el">Δραστηριότητα "Βγάζω το αυτοκίνητο"</caption>
<caption xml:lang="en-GB">"A sliding-block puzzle game" activity</caption>
<caption xml:lang="es">Actividad «Tráfico»</caption>
+ <caption xml:lang="et">"Liuglevate klotside mängu" tegevus</caption>
<caption xml:lang="eu">"Bloke irristagarrien puzzle joko bat" jarduera</caption>
<caption xml:lang="fr">L'activité « Sortir la voiture du parking »</caption>
<caption xml:lang="gl">Actividade de «Un crebacabezas de bloques que se moven»</caption>
+ <caption xml:lang="id">Aktivitas "Permainan teka-teki menggeser balok"</caption>
<caption xml:lang="it">Attività «Un rompicapo con blocchi scorrevoli»</caption>
+ <caption xml:lang="ko">"블록 밀기 퍼즐 게임" 활동</caption>
+ <caption xml:lang="mk">"Сложувалка со лизгачки блокови" активност</caption>
<caption xml:lang="ml">"വഴി കണ്ടെത്തൽ" പ്രവർത്തനം</caption>
<caption xml:lang="nl">Activiteit "Een puzzel met schuivende blokken"</caption>
<caption xml:lang="nn">Aktiviteten «Skyvespel»</caption>
<caption xml:lang="pl">Aktywność "puzzli z przesuwającym się puzzlem"</caption>
<caption xml:lang="pt">Actividade de "Puzzle de blocos deslizantes"</caption>
<caption xml:lang="pt-BR">Atividade "Quebra-cabeça com peças deslizantes"</caption>
<caption xml:lang="ro">Activitatea "Un joc de puzzle cu blocuri glisante"</caption>
+ <caption xml:lang="sk">Aktivita "Posuvné puzzle"</caption>
<caption xml:lang="sv">Aktiviteten "Pusselspel med glidande block"</caption>
<caption xml:lang="uk">Вправа «Головоломка з пересувними блоками»</caption>
<caption xml:lang="x-test">xx"A sliding-block puzzle game" activityxx</caption>
<caption xml:lang="zh-TW">「滑動方塊」解謎遊戲</caption>
- <image width="1080" height="720">https://gcompris.net/screenshots-qt/middle/traffic.png</image>
+ <image width="1080" height="720">https://gcompris.net/screenshots_qt/large/traffic.png</image>
</screenshot>
</screenshots>
<url type="homepage">https://gcompris.net/</url>
<url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=gcompris</url>
<url type="help">https://gcompris.net/wiki/Manual</url>
- <url type="donation">https://gcompris.net/buy-en.html</url>
+ <url type="donation">https://gcompris.net/buy-en.html#donation</url>
<url type="translate">https://gcompris.net/wiki/Developer%27s_corner#Translation</url>
<update_contact>gcompris-devel@kde.org</update_contact>
<project_group>KDE</project_group>
<provides>
<binary>gcompris-qt</binary>
</provides>
<content_rating type="oars-1.1">
<content_attribute id="violence-cartoon">none</content_attribute>
<content_attribute id="violence-fantasy">none</content_attribute>
<content_attribute id="violence-realistic">none</content_attribute>
<content_attribute id="violence-bloodshed">none</content_attribute>
<content_attribute id="violence-sexual">none</content_attribute>
<content_attribute id="violence-desecration">none</content_attribute>
<content_attribute id="violence-slavery">none</content_attribute>
<content_attribute id="violence-worship">none</content_attribute>
<content_attribute id="drugs-alcohol">none</content_attribute>
<content_attribute id="drugs-narcotics">none</content_attribute>
<content_attribute id="drugs-tobacco">none</content_attribute>
<content_attribute id="sex-nudity">none</content_attribute>
<content_attribute id="sex-themes">none</content_attribute>
<content_attribute id="sex-homosexuality">none</content_attribute>
<content_attribute id="sex-prostitution">none</content_attribute>
<content_attribute id="sex-adultery">none</content_attribute>
<content_attribute id="sex-appearance">none</content_attribute>
<content_attribute id="language-profanity">none</content_attribute>
<content_attribute id="language-humor">none</content_attribute>
<content_attribute id="language-discrimination">none</content_attribute>
<content_attribute id="social-chat">none</content_attribute>
<content_attribute id="social-info">none</content_attribute>
<content_attribute id="social-audio">none</content_attribute>
<content_attribute id="social-location">none</content_attribute>
<content_attribute id="social-contacts">none</content_attribute>
<content_attribute id="money-purchasing">none</content_attribute>
<content_attribute id="money-gambling">none</content_attribute>
</content_rating>
</component>
diff --git a/org.kde.gcompris.desktop b/org.kde.gcompris.desktop
index 747320ef9..d49cf24dd 100644
--- a/org.kde.gcompris.desktop
+++ b/org.kde.gcompris.desktop
@@ -1,110 +1,99 @@
[Desktop Entry]
-Name=GCompris Educational Game
-Name[ar]=لعبة «فهمت» التعليميّة
-Name[ca]=Joc educatiu GCompris
-Name[ca@valencia]=Joc educatiu GCompris
-Name[cs]=Výuková hra GCompris
-Name[de]=GCompris-Lernspiel
-Name[el]=Εκπαιδευτικό παιχνίδι GCompris
-Name[en_GB]=GCompris Educational Game
-Name[es]=Juego educativo GCompris
-Name[et]=Hariv mäng GCompris
-Name[eu]=GCompris hezkuntza-jokoa
-Name[fi]=GCompris, opettavainen peli
-Name[fr]=Jeu éducatif GCompris
-Name[gl]=Xogo educativo GCompris
-Name[hi]=जीकोंप्रिस शेक्षणिक खेल
-Name[id]=Permainan Pendidikan GCompris
-Name[it]=Gioco didattico GCompris
-Name[ko]=GCompris 교육용 게임
-Name[ml]=ജികോംപ്രി വിദ്യാഭ്യാസപരമായ കളി
-Name[nl]=Educatief spel GCompris
-Name[nn]=GCompris leik-og-lær-spel
-Name[pl]=Gra edukacyjna GCompris
-Name[pt]=Jogo Educativo GCompris
-Name[pt_BR]=Jogo educacional GCompris
-Name[ro]=Joc educațional GCompris
-Name[ru]=Набор обучающих игр GCompris
-Name[sk]=Výuková hra GCompris
-Name[sl]=Izobraževalna igra GCompris
-Name[sv]=GCompris pedagogiskt spel
-Name[tr]=GCompris Eğitici Oyun
-Name[uk]=Освітня гра GCompris
-Name[x-test]=xxGCompris Educational Gamexx
-Name[zh_CN]=GCompris 教育游戏
-Name[zh_TW]=GCompris 教育遊戲
-GenericName=Educational game
-GenericName[ar]=لعبة تعليميّة
+Name=GCompris
+Name[ca]=GCompris
+Name[ca@valencia]=GCompris
+Name[cs]=GCompris
+Name[de]=GCompris
+Name[el]=GCompris
+Name[en_GB]=GCompris
+Name[es]=GCompris
+Name[et]=GCompris
+Name[eu]=GCompris
+Name[fr]=GCompris
+Name[gl]=GCompris
+Name[it]=GCompris
+Name[ko]=GCompris
+Name[mk]=Жикомпри
+Name[ml]=ജികോംപ്രി
+Name[nl]=GCompris
+Name[nn]=GCompris
+Name[pl]=GCompris
+Name[pt]=GCompris
+Name[pt_BR]=GCompris
+Name[ro]=GCompris
+Name[ru]=GCompris
+Name[sk]=GCompris
+Name[sv]=GCompris
+Name[uk]=GCompris
+Name[x-test]=xxGComprisxx
+Name[zh_CN]=GCompris
+GenericName=Educational Game
GenericName[ca]=Joc educatiu
GenericName[ca@valencia]=Joc educatiu
GenericName[cs]=Výuková hra
-GenericName[da]=Læringsspil
GenericName[de]=Lernspiel
GenericName[el]=Εκπαιδευτικό παιχνίδι
-GenericName[en_GB]=Educational game
+GenericName[en_GB]=Educational Game
GenericName[es]=Juego educativo
GenericName[et]=Hariv mäng
GenericName[eu]=Hezkuntza-jokoa
-GenericName[fi]=Opettavainen peli
GenericName[fr]=Jeu éducatif
GenericName[gl]=Xogo educativo
-GenericName[hi]=शेक्षणिक खेल
-GenericName[id]=Permainan Pendidikan
GenericName[it]=Gioco didattico
GenericName[ko]=교육용 게임
+GenericName[mk]=Едукативна игра
GenericName[ml]=വിദ്യാഭ്യാസപരമായ കളി
GenericName[nl]=Educatief spel
GenericName[nn]=Leik-og-lær-spel
GenericName[pl]=Gra edukacyjna
-GenericName[pt]=Jogo educativo
+GenericName[pt]=Jogo Educativo
GenericName[pt_BR]=Jogo educacional
GenericName[ro]=Joc educațional
GenericName[ru]=Обучающие игры
GenericName[sk]=Výuková hra
-GenericName[sl]=Izobraževalna igra
GenericName[sv]=Pedagogiskt spel
-GenericName[tr]=Eğitici oyun
GenericName[uk]=Освітня гра
-GenericName[x-test]=xxEducational gamexx
+GenericName[x-test]=xxEducational Gamexx
GenericName[zh_CN]=教育游戏
-GenericName[zh_TW]=教育遊戲
Comment=Multi-Activity Educational game for children 2 to 10
Comment[ar]=لعبة تعليميّة متعدّدة الأنشطة للأطفال من سنتين إلى ١٠ سنوات
+Comment[br]=C'hoari kelennadel gant oberezhioù a bep seurt evit ar vugale etre 2 ha 10 vloaz
Comment[ca]=Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys
Comment[ca@valencia]=Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys
Comment[de]=Lernspiel mit vielen Aktivitäten für Kinder von 2 bis 10 Jahren
Comment[el]=Εκπαιδευτικό παιχνίδι πολλαπλών δραστηριοτήτων για ηλικίες 2 έως 10 ετών
Comment[en_GB]=Multi-Activity Educational game for children 2 to 10
Comment[es]=Juego educativo multiactividad para niños de 2 a 10 años
Comment[et]=Rohkete tegevustega hariv mäng lastele vanuses 2-10
Comment[eu]=Jarduera anitzeko Hezkuntza-jokoa 2 eta 10 urte arteko haurrentzat
Comment[fi]=Useampitoimintoinen opettavainen peli 2–10-vuotiaille lapsille
Comment[fr]=Jeu éducatif multi-activités pour les enfants de 2 à 10 ans
-Comment[gl]=Xogo educativo con varias actividades para nenos de entre 2 e 10 anos
+Comment[gl]=Xogo educativo con varias actividades para nenos entre 2 e 10 anos
Comment[hi]=२ से १० वर्ष के बच्चों के लिए विभिन्न क्रियाएं वाला शेक्षणिक खेल
Comment[id]=GCompris adalah kumpulan permainan kegiatan pendidikan untuk anak umur 2 sampai 10 tahun
Comment[it]=Gioco didattico multi-attività per bambini da 2 a 10 anni
Comment[ko]=2-10세 어린이를 위한 다양한 활동이 있는 교육용 게임
-Comment[ml]=2 തൊട്ട് 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വേണ്ടിയുള്ള വിവിധ-പ്രവർത്തനങ്ങളിലൂടെയുള്ള വിദ്യാഭ്യാസപരമായ കളി
+Comment[mk]=Едукативна игра со повеќе активности за деца од 2 до 10 години
+Comment[ml]=2 മുതൽ 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വിവിധ പ്രവർത്തനങ്ങളിലൂടെ പഠിക്കാനായുള്ള കളി.
Comment[nl]=Educatief spel met meerdere activiteiten voor kinderen van 2 tot 10
Comment[nn]=Leik-og-lærspel med mange aktivitetar – for barn frå 2 til 10 år
Comment[pl]=Gra edukacyjna z wieloma aktywnościami dla dzieci w wieku od 2 do 10 lat
Comment[pt]=Jogo educativo multi-actividades para crianças dos 2 aos 10 anos
Comment[pt_BR]=Jogo educacional com várias atividades, para crianças de 2 a 10 anos
Comment[ro]=Joc educațional cu activități multiple pentru copii între 2 și 10 ani
Comment[ru]=Обучающие игры для детей от 2 до 10 лет
Comment[sk]=Viac-aktivitová výuková hra pre deti od 2 do 10 rokov
Comment[sl]=Izobraževalna igra z več dejavnostmi za otroke med drugim in desetim letom starosti
Comment[sv]=Pedagogiskt multiaktivitetsspel för barn från 2 till 10 år
Comment[tr]=2-10 yaş arası çocuklar için Çoklu Etkileşimli Eğitici oyun
Comment[uk]=Набір освітніх ігор для дітей від 2 до 10 років
Comment[x-test]=xxMulti-Activity Educational game for children 2 to 10xx
Comment[zh_CN]=为 2 到 10 岁儿童准备的多功能教育游戏
Comment[zh_TW]=為 2-10 歲孩子設計的教育遊戲
Exec=gcompris-qt
Icon=gcompris-qt
Terminal=false
Type=Application
Categories=Education;Game;KidsGame;
StartupNotify=true
X-DocPath=gcompris/index.html
diff --git a/platforms/sailfishOS/CMakeLists.txt b/platforms/sailfishOS/CMakeLists.txt
index dd4f2efcb..364a7c2c4 100644
--- a/platforms/sailfishOS/CMakeLists.txt
+++ b/platforms/sailfishOS/CMakeLists.txt
@@ -1,27 +1,27 @@
# Fill spec file with all the translation and rcc files
foreach(QM_FILE ${QM_FILES})
list(APPEND TRANSLATION_OUTPUT_FILES \"/usr/${_data_dest_dir}/translations/${QM_FILE}\")
endforeach()
set(TRANSLATION_GENERATED_FILES "")
if(TRANSLATION_OUTPUT_FILES)
string(REPLACE "\"\"" "\"\n\"" TRANSLATION_GENERATED_FILES ${TRANSLATION_OUTPUT_FILES})
endif()
# is there a better way to get all the activity rcc files?
get_cmake_property(_variableNames VARIABLES)
foreach(_variableName ${_variableNames})
string(FIND ${_variableName} "USE_" isActivity)
# return the index if found, -1 else. We look for string that starts with USE_ so 0.
if(NOT ${isActivity})
string(SUBSTRING ${_variableName} 4 -1 filename)
list(APPEND RCC_OUTPUT_FILES \"/usr/${_data_dest_dir}/rcc/${filename}.rcc\")
endif()
endforeach()
list(APPEND RCC_OUTPUT_FILES \"/usr/${_data_dest_dir}/rcc/menu.rcc\")
-list(APPEND RCC_OUTPUT_FILES \"/usr/${_data_dest_dir}/rcc/core.rcc\")
+list(APPEND RCC_OUTPUT_FILES \"/usr/${_data_dest_dir}/rcc/core.rcc\")
list(APPEND RCC_OUTPUT_FILES \"/usr/${_data_dest_dir}/rcc/activities.rcc\")
string(REPLACE "\"\"" "\"\n\"" RCC_GENERATED_FILES ${RCC_OUTPUT_FILES})
configure_file(${PROJECT_SOURCE_DIR}/platforms/sailfishOS/harbour-gcompris-qt.spec.cmake ${CMAKE_BINARY_DIR}/harbour-gcompris-qt.spec @ONLY)
diff --git a/platforms/sailfishOS/harbour-gcompris-qt.desktop b/platforms/sailfishOS/harbour-gcompris-qt.desktop
index b0952c7f3..ff31a4ff5 100644
--- a/platforms/sailfishOS/harbour-gcompris-qt.desktop
+++ b/platforms/sailfishOS/harbour-gcompris-qt.desktop
@@ -1,110 +1,116 @@
[Desktop Entry]
Name=GCompris Educational Game
Name[ar]=لعبة «فهمت» التعليميّة
+Name[br]=C'hoari kelennadel GCompris
Name[ca]=Joc educatiu GCompris
Name[ca@valencia]=Joc educatiu GCompris
Name[cs]=Výuková hra GCompris
Name[de]=GCompris-Lernspiel
Name[el]=Εκπαιδευτικό παιχνίδι GCompris
Name[en_GB]=GCompris Educational Game
Name[es]=Juego educativo GCompris
Name[et]=Hariv mäng GCompris
Name[eu]=GCompris hezkuntza-jokoa
Name[fi]=GCompris, opettavainen peli
Name[fr]=Jeu éducatif GCompris
Name[gl]=Xogo educativo GCompris
Name[hi]=जीकोंप्रिस शेक्षणिक खेल
Name[id]=Permainan Pendidikan GCompris
Name[it]=Gioco didattico GCompris
Name[ko]=GCompris 교육용 게임
+Name[mk]=Жикомпри едукативна игра
Name[ml]=ജികോംപ്രി വിദ്യാഭ്യാസപരമായ കളി
Name[nl]=Educatief spel GCompris
Name[nn]=GCompris leik-og-lær-spel
Name[pl]=Gra edukacyjna GCompris
Name[pt]=Jogo Educativo GCompris
Name[pt_BR]=Jogo educacional GCompris
Name[ro]=Joc educațional GCompris
Name[ru]=Набор обучающих игр GCompris
Name[sk]=Výuková hra GCompris
Name[sl]=Izobraževalna igra GCompris
Name[sv]=GCompris pedagogiskt spel
Name[tr]=GCompris Eğitici Oyun
Name[uk]=Освітня гра GCompris
Name[x-test]=xxGCompris Educational Gamexx
Name[zh_CN]=GCompris 教育游戏
Name[zh_TW]=GCompris 教育遊戲
GenericName=Educational game
GenericName[ar]=لعبة تعليميّة
+GenericName[br]=C'hoari kelennadel
GenericName[ca]=Joc educatiu
GenericName[ca@valencia]=Joc educatiu
GenericName[cs]=Výuková hra
GenericName[da]=Læringsspil
GenericName[de]=Lernspiel
GenericName[el]=Εκπαιδευτικό παιχνίδι
GenericName[en_GB]=Educational game
GenericName[es]=Juego educativo
GenericName[et]=Hariv mäng
GenericName[eu]=Hezkuntza-jokoa
GenericName[fi]=Opettavainen peli
GenericName[fr]=Jeu éducatif
GenericName[gl]=Xogo educativo
GenericName[hi]=शेक्षणिक खेल
GenericName[id]=Permainan Pendidikan
GenericName[it]=Gioco didattico
GenericName[ko]=교육용 게임
+GenericName[mk]=Едукативна игра
GenericName[ml]=വിദ്യാഭ്യാസപരമായ കളി
GenericName[nl]=Educatief spel
GenericName[nn]=Leik-og-lær-spel
GenericName[pl]=Gra edukacyjna
GenericName[pt]=Jogo educativo
GenericName[pt_BR]=Jogo educacional
GenericName[ro]=Joc educațional
GenericName[ru]=Обучающие игры
GenericName[sk]=Výuková hra
GenericName[sl]=Izobraževalna igra
GenericName[sv]=Pedagogiskt spel
GenericName[tr]=Eğitici oyun
GenericName[uk]=Освітня гра
GenericName[x-test]=xxEducational gamexx
GenericName[zh_CN]=教育游戏
GenericName[zh_TW]=教育遊戲
Comment=Multi-Activity Educational game for children 2 to 10
Comment[ar]=لعبة تعليميّة متعدّدة الأنشطة للأطفال من سنتين إلى ١٠ سنوات
+Comment[br]=C'hoari kelennadel gant oberezhioù a bep seurt evit ar vugale etre 2 ha 10 vloaz
Comment[ca]=Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys
Comment[ca@valencia]=Joc educatiu amb múltiples activitats per a infants de 2 a 10 anys
Comment[de]=Lernspiel mit vielen Aktivitäten für Kinder von 2 bis 10 Jahren
Comment[el]=Εκπαιδευτικό παιχνίδι πολλαπλών δραστηριοτήτων για ηλικίες 2 έως 10 ετών
Comment[en_GB]=Multi-Activity Educational game for children 2 to 10
Comment[es]=Juego educativo multiactividad para niños de 2 a 10 años
Comment[et]=Rohkete tegevustega hariv mäng lastele vanuses 2-10
Comment[eu]=Jarduera anitzeko Hezkuntza-jokoa 2 eta 10 urte arteko haurrentzat
Comment[fi]=Useampitoimintoinen opettavainen peli 2–10-vuotiaille lapsille
Comment[fr]=Jeu éducatif multi-activités pour les enfants de 2 à 10 ans
-Comment[gl]=Xogo educativo con varias actividades para nenos de entre 2 e 10 anos
+Comment[gl]=Xogo educativo con varias actividades para nenos entre 2 e 10 anos
Comment[hi]=२ से १० वर्ष के बच्चों के लिए विभिन्न क्रियाएं वाला शेक्षणिक खेल
Comment[id]=GCompris adalah kumpulan permainan kegiatan pendidikan untuk anak umur 2 sampai 10 tahun
Comment[it]=Gioco didattico multi-attività per bambini da 2 a 10 anni
Comment[ko]=2-10세 어린이를 위한 다양한 활동이 있는 교육용 게임
-Comment[ml]=2 തൊട്ട് 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വേണ്ടിയുള്ള വിവിധ-പ്രവർത്തനങ്ങളിലൂടെയുള്ള വിദ്യാഭ്യാസപരമായ കളി
+Comment[mk]=Едукативна игра со повеќе активности за деца од 2 до 10 години
+Comment[ml]=2 മുതൽ 10 വയസ്സുവരെയുള്ള കുട്ടികൾക്ക് വിവിധ പ്രവർത്തനങ്ങളിലൂടെ പഠിക്കാനായുള്ള കളി.
Comment[nl]=Educatief spel met meerdere activiteiten voor kinderen van 2 tot 10
Comment[nn]=Leik-og-lærspel med mange aktivitetar – for barn frå 2 til 10 år
Comment[pl]=Gra edukacyjna z wieloma aktywnościami dla dzieci w wieku od 2 do 10 lat
Comment[pt]=Jogo educativo multi-actividades para crianças dos 2 aos 10 anos
Comment[pt_BR]=Jogo educacional com várias atividades, para crianças de 2 a 10 anos
Comment[ro]=Joc educațional cu activități multiple pentru copii între 2 și 10 ani
Comment[ru]=Обучающие игры для детей от 2 до 10 лет
Comment[sk]=Viac-aktivitová výuková hra pre deti od 2 do 10 rokov
Comment[sl]=Izobraževalna igra z več dejavnostmi za otroke med drugim in desetim letom starosti
Comment[sv]=Pedagogiskt multiaktivitetsspel för barn från 2 till 10 år
Comment[tr]=2-10 yaş arası çocuklar için Çoklu Etkileşimli Eğitici oyun
Comment[uk]=Набір освітніх ігор для дітей від 2 до 10 років
Comment[x-test]=xxMulti-Activity Educational game for children 2 to 10xx
Comment[zh_CN]=为 2 到 10 岁儿童准备的多功能教育游戏
Comment[zh_TW]=為 2-10 歲孩子設計的教育遊戲
Exec=harbour-gcompris-qt
Icon=harbour-gcompris-qt
Terminal=false
Type=Application
Categories=Education;Game;KidsGame;
StartupNotify=true
X-Nemo-Application-Type=generic
diff --git a/src/Messages.sh b/src/Messages.sh
index df9ec40ec..436ecdf6f 100755
--- a/src/Messages.sh
+++ b/src/Messages.sh
@@ -1,10 +1,12 @@
#!/bin/sh
# Extract strings from all source files.
# EXTRACT_TR_STRINGS extracts strings with lupdate and convert them to .pot with
# lconvert.
$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -o -name \*.qml -o -name \*.js` -o $podir/gcompris_qt.pot
# create a pot for the voices text to keep them up-to-date with the audio files
-grep -R "intro: " --include="ActivityInfo.qml" | awk -F'[:/]' '{print "//i18n: intro voices, see GCompris-voices/README.md - activity: \""$2"\"\ni18n("$7");"}' | $XGETTEXT - -o $podir/gcompris_voices.pot
+find . -name ActivityInfo.qml -exec awk -f activityintro2msg.awk {} \; > rc.cpp
+$XGETTEXT rc.cpp -o $podir/gcompris_voices.pot
+rm rc.cpp
diff --git a/src/activities/advanced_colors/resource/README b/src/activities/advanced_colors/resource/README
index a6c129061..2cd70fdfd 100644
--- a/src/activities/advanced_colors/resource/README
+++ b/src/activities/advanced_colors/resource/README
@@ -1,4 +1,78 @@
-Copyright: Timothée Giet, 2015
-License: Public Domain
+Copyright: Timothée Giet, 2019
+License: CC-BY-SA 4.0
Files:
-*_butterfly.svg
+absinthe_butterfly.svg
+alabaster_butterfly.svg
+almond_butterfly.svg
+amber_butterfly.svg
+amethyst_butterfly.svg
+anise_butterfly.svg
+aquamarine_butterfly.svg
+aubergine_butterfly.svg
+auburn_butterfly.svg
+azure_butterfly.svg
+bistre_butterfly.svg
+celadon_butterfly.svg
+cerulean_butterfly.svg
+ceruse_butterfly.svg
+chartreuse_butterfly.svg
+chestnut_butterfly.svg
+claret_butterfly.svg
+cobalt_butterfly.svg
+coral_butterfly.svg
+corn_butterfly.svg
+crimson_butterfly.svg
+cyan_butterfly.svg
+dark_purple_butterfly.svg
+dove_butterfly.svg
+emerald_butterfly.svg
+fawn_butterfly.svg
+fuchsia_butterfly.svg
+garnet_butterfly.svg
+glaucous_butterfly.svg
+greyish_blue_butterfly.svg
+greyish-brown_butterfly.svg
+indigo_butterfly.svg
+ivory_butterfly.svg
+jade_butterfly.svg
+larch_butterfly.svg
+lavender_butterfly.svg
+lichen_butterfly.svg
+lilac_butterfly.svg
+lime_butterfly.svg
+magenta_butterfly.svg
+mahogany_butterfly.svg
+malachite_butterfly.svg
+mauve_butterfly.svg
+mimosa_butterfly.svg
+navy_butterfly.svg
+ochre_butterfly.svg
+olive_butterfly.svg
+opaline_butterfly.svg
+pistachio_butterfly.svg
+platinum_butterfly.svg
+plum_butterfly.svg
+prussian_blue_butterfly.svg
+purple_butterfly.svg
+ruby_butterfly.svg
+rust_butterfly.svg
+saffron_butterfly.svg
+sage_butterfly.svg
+salmon_butterfly.svg
+sapphire_butterfly.svg
+sepia_butterfly.svg
+sienna_butterfly.svg
+sulphur_butterfly.svg
+tea_butterfly.svg
+turquoise_butterfly.svg
+ultramarine_butterfly.svg
+vanilla_butterfly.svg
+verdigris_butterfly.svg
+vermilion_butterfly.svg
+veronese_butterfly.svg
+wine_butterfly.svg
+
+
+/* Notes:
+ * Color codes gathered on different websites. A few are adapted a little to make all items easier to differentiate.
+ */
diff --git a/src/activities/advanced_colors/resource/absinthe_butterfly.svg b/src/activities/advanced_colors/resource/absinthe_butterfly.svg
index bc5d3411c..4eb1890ca 100644
--- a/src/activities/advanced_colors/resource/absinthe_butterfly.svg
+++ b/src/activities/advanced_colors/resource/absinthe_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="absinthe_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#73b881;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#73b881;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#73b881;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#73b881;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/alabaster_butterfly.svg b/src/activities/advanced_colors/resource/alabaster_butterfly.svg
index 5ae1daa7a..1e8a2725b 100644
--- a/src/activities/advanced_colors/resource/alabaster_butterfly.svg
+++ b/src/activities/advanced_colors/resource/alabaster_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="alabaster_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#f2f0e6;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f2f0e6;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#f0e1bf;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#f0e1bf;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/almond_butterfly.svg b/src/activities/advanced_colors/resource/almond_butterfly.svg
index 97d25e991..44a072a04 100644
--- a/src/activities/advanced_colors/resource/almond_butterfly.svg
+++ b/src/activities/advanced_colors/resource/almond_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="almond_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#ab784e;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ab784e;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#ab784e;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#ab784e;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/amber_butterfly.svg b/src/activities/advanced_colors/resource/amber_butterfly.svg
index c142a41a3..e48189d14 100644
--- a/src/activities/advanced_colors/resource/amber_butterfly.svg
+++ b/src/activities/advanced_colors/resource/amber_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="amber_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="8.0527297"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#ffbf00;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#ffa943;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#ffa943;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/amethyst_butterfly.svg b/src/activities/advanced_colors/resource/amethyst_butterfly.svg
index d26b3cd99..827179dc4 100644
--- a/src/activities/advanced_colors/resource/amethyst_butterfly.svg
+++ b/src/activities/advanced_colors/resource/amethyst_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="amethyst_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#9966cc;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9966cc;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#9966cc;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#9966cc;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/anise_butterfly.svg b/src/activities/advanced_colors/resource/anise_butterfly.svg
index c902fc7de..e855dbcaf 100644
--- a/src/activities/advanced_colors/resource/anise_butterfly.svg
+++ b/src/activities/advanced_colors/resource/anise_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="anise_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#f5eacc;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f5eacc;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#a7d67d;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#a7d67d;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/aquamarine_butterfly.svg b/src/activities/advanced_colors/resource/aquamarine_butterfly.svg
index 6ec2c4b3a..ab54162af 100644
--- a/src/activities/advanced_colors/resource/aquamarine_butterfly.svg
+++ b/src/activities/advanced_colors/resource/aquamarine_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="aquamarine_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#7fffd4;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#7fffd4;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#7fffd4;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#7fffd4;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/aubergine_butterfly.svg b/src/activities/advanced_colors/resource/aubergine_butterfly.svg
index 11c0b1988..5436064c4 100644
--- a/src/activities/advanced_colors/resource/aubergine_butterfly.svg
+++ b/src/activities/advanced_colors/resource/aubergine_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="aubergine_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#614051;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#614051;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#370028;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#370028;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/auburn_butterfly.svg b/src/activities/advanced_colors/resource/auburn_butterfly.svg
index 2b9587224..a4b3ec0d6 100644
--- a/src/activities/advanced_colors/resource/auburn_butterfly.svg
+++ b/src/activities/advanced_colors/resource/auburn_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="auburn_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="8.0527297"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#a52a2a;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#a52a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#9f6558;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#9f6558;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/azure_butterfly.svg b/src/activities/advanced_colors/resource/azure_butterfly.svg
index dc0de1e23..32bbddb8f 100644
--- a/src/activities/advanced_colors/resource/azure_butterfly.svg
+++ b/src/activities/advanced_colors/resource/azure_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="azure_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#458ac6;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#458ac6;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#458ac6;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#458ac6;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/bistre_butterfly.svg b/src/activities/advanced_colors/resource/bistre_butterfly.svg
index 09ad23097..96a511c76 100644
--- a/src/activities/advanced_colors/resource/bistre_butterfly.svg
+++ b/src/activities/advanced_colors/resource/bistre_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="bistre_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#3d2b1f;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#3d2b1f;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#927141;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#927141;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/celadon_butterfly.svg b/src/activities/advanced_colors/resource/celadon_butterfly.svg
index 540a95d47..964948c49 100644
--- a/src/activities/advanced_colors/resource/celadon_butterfly.svg
+++ b/src/activities/advanced_colors/resource/celadon_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="celadon_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#ace1af;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ace1af;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#b5ccb8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#b5ccb8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/cerulean_butterfly.svg b/src/activities/advanced_colors/resource/cerulean_butterfly.svg
index c14693422..ec35ea920 100644
--- a/src/activities/advanced_colors/resource/cerulean_butterfly.svg
+++ b/src/activities/advanced_colors/resource/cerulean_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="cerulean_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#007ba7;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#007ba7;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#007ba7;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#007ba7;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/ceruse_butterfly.svg b/src/activities/advanced_colors/resource/ceruse_butterfly.svg
index 37a788eb9..841743efa 100644
--- a/src/activities/advanced_colors/resource/ceruse_butterfly.svg
+++ b/src/activities/advanced_colors/resource/ceruse_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="ceruse_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="8.0527297"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#eeebeb;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#eeebeb;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#fcfcf8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#fcfcf8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/chartreuse_butterfly.svg b/src/activities/advanced_colors/resource/chartreuse_butterfly.svg
index 30304a88b..4742f1983 100644
--- a/src/activities/advanced_colors/resource/chartreuse_butterfly.svg
+++ b/src/activities/advanced_colors/resource/chartreuse_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="chartreuse_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#7fff00;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#7fff00;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#7fff00;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#7fff00;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/chestnut_butterfly.svg b/src/activities/advanced_colors/resource/chestnut_butterfly.svg
index 5f337f89a..138ffc7bb 100644
--- a/src/activities/advanced_colors/resource/chestnut_butterfly.svg
+++ b/src/activities/advanced_colors/resource/chestnut_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="chestnut_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#954535;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#954535;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#954535;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#954535;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/claret_butterfly.svg b/src/activities/advanced_colors/resource/claret_butterfly.svg
index c2962bb0e..5a8a6bc00 100644
--- a/src/activities/advanced_colors/resource/claret_butterfly.svg
+++ b/src/activities/advanced_colors/resource/claret_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="claret_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#7f1734;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#7f1734;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#7f1734;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#7f1734;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/cobalt_butterfly.svg b/src/activities/advanced_colors/resource/cobalt_butterfly.svg
index 4f07bc01b..b2f2fc10f 100644
--- a/src/activities/advanced_colors/resource/cobalt_butterfly.svg
+++ b/src/activities/advanced_colors/resource/cobalt_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="cobalt_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#0047ab;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#0047ab;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#0047ab;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#0047ab;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/coral_butterfly.svg b/src/activities/advanced_colors/resource/coral_butterfly.svg
index 4da2851c8..f47860e66 100644
--- a/src/activities/advanced_colors/resource/coral_butterfly.svg
+++ b/src/activities/advanced_colors/resource/coral_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="coral_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#ff7f50;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff7f50;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#ec7266;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#ec7266;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/corn_butterfly.svg b/src/activities/advanced_colors/resource/corn_butterfly.svg
index a21aa3a8c..99ec02715 100644
--- a/src/activities/advanced_colors/resource/corn_butterfly.svg
+++ b/src/activities/advanced_colors/resource/corn_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="corn_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="8.0527297"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#fbec5d;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#fbec5d;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#ffe389;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#ffe389;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/crimson_butterfly.svg b/src/activities/advanced_colors/resource/crimson_butterfly.svg
index 8a719e3b4..8570ff257 100644
--- a/src/activities/advanced_colors/resource/crimson_butterfly.svg
+++ b/src/activities/advanced_colors/resource/crimson_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="crimson_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#dc143c;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dc143c;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#dc143c;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#dc143c;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/cyan_butterfly.svg b/src/activities/advanced_colors/resource/cyan_butterfly.svg
index e03a7b5dd..42514c202 100644
--- a/src/activities/advanced_colors/resource/cyan_butterfly.svg
+++ b/src/activities/advanced_colors/resource/cyan_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="cyan_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#00ffff;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#00ffff;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#00b7eb;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#00b7eb;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/dark_purple_butterfly.svg b/src/activities/advanced_colors/resource/dark_purple_butterfly.svg
index 3004e773a..520af541a 100644
--- a/src/activities/advanced_colors/resource/dark_purple_butterfly.svg
+++ b/src/activities/advanced_colors/resource/dark_purple_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="dark_purple_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="25.947254"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#32004a;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#32004a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#462759;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#462759;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/dove_butterfly.svg b/src/activities/advanced_colors/resource/dove_butterfly.svg
index 5dd4c8522..24bd6040b 100644
--- a/src/activities/advanced_colors/resource/dove_butterfly.svg
+++ b/src/activities/advanced_colors/resource/dove_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="dove_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="8.0527297"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#8b8e8d;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#8b8e8d;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#b8b4b0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#b8b4b0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/emerald_butterfly.svg b/src/activities/advanced_colors/resource/emerald_butterfly.svg
index 17d6ebb83..7147c72d5 100644
--- a/src/activities/advanced_colors/resource/emerald_butterfly.svg
+++ b/src/activities/advanced_colors/resource/emerald_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="emerald_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#50c878;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#50c878;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#009874;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#009874;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/fawn_butterfly.svg b/src/activities/advanced_colors/resource/fawn_butterfly.svg
index 841ae2777..11228593b 100644
--- a/src/activities/advanced_colors/resource/fawn_butterfly.svg
+++ b/src/activities/advanced_colors/resource/fawn_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="fawn_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#e5aa70;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#e5aa70;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#e5aa70;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#e5aa70;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/fuchsia_butterfly.svg b/src/activities/advanced_colors/resource/fuchsia_butterfly.svg
index 908839e4c..3ff6a83b3 100644
--- a/src/activities/advanced_colors/resource/fuchsia_butterfly.svg
+++ b/src/activities/advanced_colors/resource/fuchsia_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="fuchsia_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#cc397b;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#cc397b;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#ff00ff;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#ff00ff;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/garnet_butterfly.svg b/src/activities/advanced_colors/resource/garnet_butterfly.svg
index e93ac1030..20a9801b3 100644
--- a/src/activities/advanced_colors/resource/garnet_butterfly.svg
+++ b/src/activities/advanced_colors/resource/garnet_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="garnet_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#943543;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#943543;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#943543;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#943543;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/glaucous_butterfly.svg b/src/activities/advanced_colors/resource/glaucous_butterfly.svg
index 7fa14b4d0..55c8d3298 100644
--- a/src/activities/advanced_colors/resource/glaucous_butterfly.svg
+++ b/src/activities/advanced_colors/resource/glaucous_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="glaucous_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#6082b6;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6082b6;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#6082b6;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#6082b6;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/greyish-brown_butterfly.svg b/src/activities/advanced_colors/resource/greyish-brown_butterfly.svg
index bac922f75..8b096a666 100644
--- a/src/activities/advanced_colors/resource/greyish-brown_butterfly.svg
+++ b/src/activities/advanced_colors/resource/greyish-brown_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="greyish-brown_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#9f7f58;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9f7f58;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#948c81;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#948c81;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/greyish_blue_butterfly.svg b/src/activities/advanced_colors/resource/greyish_blue_butterfly.svg
index eaf35e194..988fae73e 100644
--- a/src/activities/advanced_colors/resource/greyish_blue_butterfly.svg
+++ b/src/activities/advanced_colors/resource/greyish_blue_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="greyish_blue_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#91a3b0;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#91a3b0;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#93adc0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#93adc0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/indigo_butterfly.svg b/src/activities/advanced_colors/resource/indigo_butterfly.svg
index 62f75be2d..20903bd2e 100644
--- a/src/activities/advanced_colors/resource/indigo_butterfly.svg
+++ b/src/activities/advanced_colors/resource/indigo_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="indigo_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#4b0082;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#4b0082;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#4b0082;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#4b0082;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/ivory_butterfly.svg b/src/activities/advanced_colors/resource/ivory_butterfly.svg
index a8a652060..ba0cf98a3 100644
--- a/src/activities/advanced_colors/resource/ivory_butterfly.svg
+++ b/src/activities/advanced_colors/resource/ivory_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="ivory_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="8.0527297"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="938"
+ inkscape:window-height="1051"
+ inkscape:window-x="942"
+ inkscape:window-y="0"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#fffff0;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#fffff0;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#feffe4;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#feffe4;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/jade_butterfly.svg b/src/activities/advanced_colors/resource/jade_butterfly.svg
index 808b65eea..fbbdcd883 100644
--- a/src/activities/advanced_colors/resource/jade_butterfly.svg
+++ b/src/activities/advanced_colors/resource/jade_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="jade_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#00a86b;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#00a86b;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#00a86b;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#00a86b;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/larch_butterfly.svg b/src/activities/advanced_colors/resource/larch_butterfly.svg
index 123b26152..a414e8422 100644
--- a/src/activities/advanced_colors/resource/larch_butterfly.svg
+++ b/src/activities/advanced_colors/resource/larch_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="larch_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="-8.1079846"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#d9c3ad;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#d9c3ad;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#d4ae89;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#d4ae89;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/lavender_butterfly.svg b/src/activities/advanced_colors/resource/lavender_butterfly.svg
index 77ee28588..7b67c0999 100644
--- a/src/activities/advanced_colors/resource/lavender_butterfly.svg
+++ b/src/activities/advanced_colors/resource/lavender_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="lavender_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#b57edc;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b57edc;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#9f90d0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#9f90d0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/lichen_butterfly.svg b/src/activities/advanced_colors/resource/lichen_butterfly.svg
index 6dd2f2723..c6d787501 100644
--- a/src/activities/advanced_colors/resource/lichen_butterfly.svg
+++ b/src/activities/advanced_colors/resource/lichen_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="lichen_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#9bc4af;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9bc4af;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#9bc4af;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#9bc4af;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/lilac_butterfly.svg b/src/activities/advanced_colors/resource/lilac_butterfly.svg
index d8722dd0f..edb65034d 100644
--- a/src/activities/advanced_colors/resource/lilac_butterfly.svg
+++ b/src/activities/advanced_colors/resource/lilac_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="lilac_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#9955bb;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9955bb;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#c593c8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#c593c8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/lime_butterfly.svg b/src/activities/advanced_colors/resource/lime_butterfly.svg
index 472e7cbdb..607fcf405 100644
--- a/src/activities/advanced_colors/resource/lime_butterfly.svg
+++ b/src/activities/advanced_colors/resource/lime_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="lime_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#bfff00;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#bfff00;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#b7c52c;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#b7c52c;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/magenta_butterfly.svg b/src/activities/advanced_colors/resource/magenta_butterfly.svg
index 72c45f803..d24bd0bdb 100644
--- a/src/activities/advanced_colors/resource/magenta_butterfly.svg
+++ b/src/activities/advanced_colors/resource/magenta_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="magenta_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#ff00ff;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff00ff;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#d0417e;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#d0417e;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/mahogany_butterfly.svg b/src/activities/advanced_colors/resource/mahogany_butterfly.svg
index 1f1a8934c..18cce98a9 100644
--- a/src/activities/advanced_colors/resource/mahogany_butterfly.svg
+++ b/src/activities/advanced_colors/resource/mahogany_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="mahogany_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#c04000;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#c04000;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#c04000;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#c04000;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/malachite_butterfly.svg b/src/activities/advanced_colors/resource/malachite_butterfly.svg
index 578c94644..2105e0d5e 100644
--- a/src/activities/advanced_colors/resource/malachite_butterfly.svg
+++ b/src/activities/advanced_colors/resource/malachite_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="malachite_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#0bda51;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#0bda51;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#0bda51;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#0bda51;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/mauve_butterfly.svg b/src/activities/advanced_colors/resource/mauve_butterfly.svg
index 3a1c169ed..3c441d1c0 100644
--- a/src/activities/advanced_colors/resource/mauve_butterfly.svg
+++ b/src/activities/advanced_colors/resource/mauve_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="mauve_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#e0b0ff;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#e0b0ff;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#e0b0ff;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#e0b0ff;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/mimosa_butterfly.svg b/src/activities/advanced_colors/resource/mimosa_butterfly.svg
index 41f6f9bc0..408a887e3 100644
--- a/src/activities/advanced_colors/resource/mimosa_butterfly.svg
+++ b/src/activities/advanced_colors/resource/mimosa_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="mimosa_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="4.838444"
+ inkscape:cy="28.611172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#efc050;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#efc050;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#fef9ae;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#fef9ae;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/navy_butterfly.svg b/src/activities/advanced_colors/resource/navy_butterfly.svg
index 1f81890fb..769626cc3 100644
--- a/src/activities/advanced_colors/resource/navy_butterfly.svg
+++ b/src/activities/advanced_colors/resource/navy_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="navy_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#000080;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#000080;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#000080;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#000080;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/ochre_butterfly.svg b/src/activities/advanced_colors/resource/ochre_butterfly.svg
index 7e7455212..29682eead 100644
--- a/src/activities/advanced_colors/resource/ochre_butterfly.svg
+++ b/src/activities/advanced_colors/resource/ochre_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="ochre_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#cc7722;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#cc7722;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#d8ac59;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#d8ac59;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/olive_butterfly.svg b/src/activities/advanced_colors/resource/olive_butterfly.svg
index 252558d7c..3b373c22f 100644
--- a/src/activities/advanced_colors/resource/olive_butterfly.svg
+++ b/src/activities/advanced_colors/resource/olive_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="olive_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#808000;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#808000;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#808000;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#808000;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/opaline_butterfly.svg b/src/activities/advanced_colors/resource/opaline_butterfly.svg
index 7b1f595ee..91420bcfa 100644
--- a/src/activities/advanced_colors/resource/opaline_butterfly.svg
+++ b/src/activities/advanced_colors/resource/opaline_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="opaline_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#f7f9f4;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f7f9f4;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#a5c780;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#a5c780;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/pistachio_butterfly.svg b/src/activities/advanced_colors/resource/pistachio_butterfly.svg
index fcf736148..e1e38ebc2 100644
--- a/src/activities/advanced_colors/resource/pistachio_butterfly.svg
+++ b/src/activities/advanced_colors/resource/pistachio_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="pistachio_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#93c572;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#93c572;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#93c572;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#93c572;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/platinum_butterfly.svg b/src/activities/advanced_colors/resource/platinum_butterfly.svg
index b93b82976..3f1bc317e 100644
--- a/src/activities/advanced_colors/resource/platinum_butterfly.svg
+++ b/src/activities/advanced_colors/resource/platinum_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="platinum_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#aeada5;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#aeada5;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#9b9a99;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#9b9a99;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/plum_butterfly.svg b/src/activities/advanced_colors/resource/plum_butterfly.svg
index e8bcdd83a..f06d01b47 100644
--- a/src/activities/advanced_colors/resource/plum_butterfly.svg
+++ b/src/activities/advanced_colors/resource/plum_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="plum_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#5c3960;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#5c3960;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#5c3960;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#5c3960;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/prussian_blue_butterfly.svg b/src/activities/advanced_colors/resource/prussian_blue_butterfly.svg
index ae664d172..206355e99 100644
--- a/src/activities/advanced_colors/resource/prussian_blue_butterfly.svg
+++ b/src/activities/advanced_colors/resource/prussian_blue_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="prussian_blue_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#003153;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#003153;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#003153;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#003153;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/purple_butterfly.svg b/src/activities/advanced_colors/resource/purple_butterfly.svg
index d28be3a80..d250b7c2b 100644
--- a/src/activities/advanced_colors/resource/purple_butterfly.svg
+++ b/src/activities/advanced_colors/resource/purple_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="purple_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="25.947254"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#66023c;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#66023c;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#7f007f;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#7f007f;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/ruby_butterfly.svg b/src/activities/advanced_colors/resource/ruby_butterfly.svg
index a159702a1..6c85e9f65 100644
--- a/src/activities/advanced_colors/resource/ruby_butterfly.svg
+++ b/src/activities/advanced_colors/resource/ruby_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="ruby_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#e0115f;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#e0115f;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#e0115f;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#e0115f;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/rust_butterfly.svg b/src/activities/advanced_colors/resource/rust_butterfly.svg
index f3f1aeddb..13c08f197 100644
--- a/src/activities/advanced_colors/resource/rust_butterfly.svg
+++ b/src/activities/advanced_colors/resource/rust_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="rust_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#b7410e;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b7410e;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#b0583a;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#b0583a;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/saffron_butterfly.svg b/src/activities/advanced_colors/resource/saffron_butterfly.svg
index 340dd2f9f..53ef8c5d6 100644
--- a/src/activities/advanced_colors/resource/saffron_butterfly.svg
+++ b/src/activities/advanced_colors/resource/saffron_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="saffron_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#f4c430;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f4c430;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#ffac00;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#ffac00;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/sage_butterfly.svg b/src/activities/advanced_colors/resource/sage_butterfly.svg
index 156ba72bc..ba3888fce 100644
--- a/src/activities/advanced_colors/resource/sage_butterfly.svg
+++ b/src/activities/advanced_colors/resource/sage_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="sage_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#bcb88a;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#bcb88a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#8f916b;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#8f916b;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/salmon_butterfly.svg b/src/activities/advanced_colors/resource/salmon_butterfly.svg
index d125a9f19..a7468e768 100644
--- a/src/activities/advanced_colors/resource/salmon_butterfly.svg
+++ b/src/activities/advanced_colors/resource/salmon_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="salmon_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#ff8c69;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff8c69;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#f6ac97;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#f6ac97;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/sapphire_butterfly.svg b/src/activities/advanced_colors/resource/sapphire_butterfly.svg
index fe5d114d0..3a10d876e 100644
--- a/src/activities/advanced_colors/resource/sapphire_butterfly.svg
+++ b/src/activities/advanced_colors/resource/sapphire_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="sapphire_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#0f52ba;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#0f52ba;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#3f5281;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#3f5281;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/sepia_butterfly.svg b/src/activities/advanced_colors/resource/sepia_butterfly.svg
index d483ea690..6376fb71d 100644
--- a/src/activities/advanced_colors/resource/sepia_butterfly.svg
+++ b/src/activities/advanced_colors/resource/sepia_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="sepia_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#704214;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#704214;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#3a2f2d;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#3a2f2d;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/sienna_butterfly.svg b/src/activities/advanced_colors/resource/sienna_butterfly.svg
index b1d04bbe9..d5163e9d7 100644
--- a/src/activities/advanced_colors/resource/sienna_butterfly.svg
+++ b/src/activities/advanced_colors/resource/sienna_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="sienna_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#882d17;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#882d17;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#b86e53;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#b86e53;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/sulphur_butterfly.svg b/src/activities/advanced_colors/resource/sulphur_butterfly.svg
index 90a7aaa55..e51b8a304 100644
--- a/src/activities/advanced_colors/resource/sulphur_butterfly.svg
+++ b/src/activities/advanced_colors/resource/sulphur_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="sulphur_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#e4bb25;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#e4bb25;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#e4bb25;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#e4bb25;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/tea_butterfly.svg b/src/activities/advanced_colors/resource/tea_butterfly.svg
index 4af102bcf..2c3cc7101 100644
--- a/src/activities/advanced_colors/resource/tea_butterfly.svg
+++ b/src/activities/advanced_colors/resource/tea_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="tea_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#db6d7b;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#db6d7b;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#db6d7b;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#db6d7b;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/turquoise_butterfly.svg b/src/activities/advanced_colors/resource/turquoise_butterfly.svg
index 45ce8c586..2d4b0e455 100644
--- a/src/activities/advanced_colors/resource/turquoise_butterfly.svg
+++ b/src/activities/advanced_colors/resource/turquoise_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="turquoise_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#40e0d0;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#40e0d0;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#40e0d0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#40e0d0;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/ultramarine_butterfly.svg b/src/activities/advanced_colors/resource/ultramarine_butterfly.svg
index c9cb77df4..3d9358d8f 100644
--- a/src/activities/advanced_colors/resource/ultramarine_butterfly.svg
+++ b/src/activities/advanced_colors/resource/ultramarine_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="ultramarine_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#120a8f;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#120a8f;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#120aff;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#120aff;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/vanilla_butterfly.svg b/src/activities/advanced_colors/resource/vanilla_butterfly.svg
index b4acccda2..58e57eb2c 100644
--- a/src/activities/advanced_colors/resource/vanilla_butterfly.svg
+++ b/src/activities/advanced_colors/resource/vanilla_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="vanilla_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="-24.268699"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#f3e5ab;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f3e5ab;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#f8e2a8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#f8e2a8;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/verdigris_butterfly.svg b/src/activities/advanced_colors/resource/verdigris_butterfly.svg
index 6e95e7861..114a7fd42 100644
--- a/src/activities/advanced_colors/resource/verdigris_butterfly.svg
+++ b/src/activities/advanced_colors/resource/verdigris_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="verdigris_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#529371;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#529371;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#43b3ae;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#43b3ae;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/vermilion_butterfly.svg b/src/activities/advanced_colors/resource/vermilion_butterfly.svg
index 734bb87f1..70f2e5c7f 100644
--- a/src/activities/advanced_colors/resource/vermilion_butterfly.svg
+++ b/src/activities/advanced_colors/resource/vermilion_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="vermilion_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#e34234;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#e34234;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#e34233;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#e34233;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/veronese_butterfly.svg b/src/activities/advanced_colors/resource/veronese_butterfly.svg
index f2d594513..81dcadceb 100644
--- a/src/activities/advanced_colors/resource/veronese_butterfly.svg
+++ b/src/activities/advanced_colors/resource/veronese_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="veronese_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#40826d;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#40826d;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#5a6521;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#5a6521;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/advanced_colors/resource/wine_butterfly.svg b/src/activities/advanced_colors/resource/wine_butterfly.svg
index 52d28afe1..f26af8ca3 100644
--- a/src/activities/advanced_colors/resource/wine_butterfly.svg
+++ b/src/activities/advanced_colors/resource/wine_butterfly.svg
@@ -1,141 +1,139 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="74.922989"
- height="77.923302"
+ width="64"
+ height="64"
id="svg10560"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="wine_butterfly.svg">
<defs
id="defs10562" />
<sodipodi:namedview
id="base"
- pagecolor="#82e44f"
+ pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- inkscape:pageopacity="0.0"
+ inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:zoom="7.9195959"
- inkscape:cx="45.645229"
- inkscape:cy="38.712509"
+ inkscape:zoom="11.2"
+ inkscape:cx="24.213444"
+ inkscape:cy="27.986172"
inkscape:document-units="px"
inkscape:current-layer="layer1-0"
showgrid="false"
fit-margin-top="5"
fit-margin-left="5"
fit-margin-right="5"
fit-margin-bottom="5"
- inkscape:window-width="1366"
- inkscape:window-height="706"
- inkscape:window-x="-8"
- inkscape:window-y="-8"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid857" />
+ </sodipodi:namedview>
<metadata
id="metadata10565">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(1.7669454,-126.37667)">
+ transform="translate(1.7669454,-140.29997)">
<g
id="layer1-54"
inkscape:label="Layer 1"
transform="translate(239.835,239.34116)">
<g
- transform="matrix(0.6817788,0.7315584,-0.7315584,0.6817788,280.43181,-146.52369)"
+ transform="rotate(47.017199,308.63748,249.08035)"
id="g3199" />
<g
transform="translate(-227.14286,-28.571429)"
id="g3464">
<g
id="layer1-0"
inkscape:label="Calque 1"
transform="matrix(0.06725509,0,0,0.06725509,-12.949471,-73.82934)">
<path
- sodipodi:nodetypes="csscsc"
- id="path10711"
- d="m 576.68633,293.05189 c 0,120.08926 -195.58879,285.84912 -310.28066,285.84912 -114.69195,0 -207.668131,-97.35154 -207.668131,-217.4408 0,-63.39742 79.661731,-296.364857 189.410151,-42.93187 -114.50805,-201.67611 135.13481,-394.392777 189.2788,-394.392777 114.69185,0 139.25984,248.827227 139.25984,368.916327 z"
- style="fill:#722f37;fill-opacity:0.93333334;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#722f37;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:13.681663512a2a2a000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
- d="M 670.83071,420.86667 C 552.64662,399.56159 354.81677,562.64001 334.46906,675.51254 c -20.34749,112.8727 58.96472,221.64501 177.14898,242.9501 62.39164,11.24735 305.79648,-25.8197 75.85423,-178.78891 C 765.63421,888.14475 999.58314,676.65188 1009.1887,623.36693 1029.5364,510.4944 789.01498,442.17176 670.83071,420.86667 z"
- id="path11224"
- sodipodi:nodetypes="csscsc"
- inkscape:connector-curvature="0" />
+ style="fill:#722f37;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 423.03067,525.50004 C 476.53842,304.89791 326.34123,64.582408 261.56869,91.80565 c -64.77254,27.22324 -159.58451,178.35916 -103.26056,315.4141 -28.16198,-11.26479 -54.25893,-31.34301 -97.041471,1.99481 -72.37486,56.39731 -42.943356,237.77619 -0.58671,279.62492 42.356671,41.84874 231.866921,-40.36549 258.151421,-61.01761 8.919,-7.00779 104.1993,-102.32183 104.1993,-102.32183 z"
+ id="path979"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- transform="matrix(1.3435804,-1.058113,1.058113,1.3435804,-587.61887,110.94261)"
- d="M 497.14287,556.64789 A 147.14287,41.428574 0 0 1 350,598.07646 147.14287,41.428574 0 0 1 202.85713,556.64789 147.14287,41.428574 0 0 1 350,515.21931 147.14287,41.428574 0 0 1 497.14287,556.64789 Z"
- sodipodi:ry="41.428574"
- sodipodi:rx="147.14287"
- sodipodi:cy="556.64789"
- sodipodi:cx="350"
- id="path11226"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#2a2a2a;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
+ style="fill:#722f37;fill-opacity:1;stroke:#808080;stroke-width:3.71719074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 453.60748,556.07683 c 220.60212,-53.50774 460.91763,96.68946 433.69441,161.46202 -27.22328,64.77248 -178.35917,159.58449 -315.41412,103.26054 11.26479,28.16198 31.34301,54.25892 -1.99481,97.04146 -56.3973,72.37486 -237.77618,42.94336 -279.62492,0.58671 -41.8487,-42.35672 40.3655,-231.86691 61.01761,-258.15142 7.00779,-8.919 102.32179,-104.19935 102.32179,-104.19935 z"
+ id="path979-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscszsc" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230"
- d="m 701.44019,95.886451 c -5.6731,33.240289 -27.97541,55.447339 -57.45649,48.952479 -34.05845,-7.50336 -35.95593,-47.908226 -28.97332,-84.702154 7.93827,-41.828609 54.10705,-50.1439823 91.39933,-41.243889 41.85306,9.98847 65.67011,73.394089 56.49792,118.794293 -3.65318,18.08255 -14.89831,36.83292 -28.93946,51.27991 -4.48211,4.61157 -38.59837,38.32747 -70.66921,94.04998 -54.84791,95.29741 -142.33292,94.52627 -147.64004,96.77366"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:439.48733521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 395.03944,641.89373 c -81.2923,81.2923 -200.18667,178.30934 -218.16084,160.33517 -17.97417,-17.97416 79.04288,-136.86854 160.33518,-218.16084 81.29232,-81.29232 116.07623,-94.1989 134.05039,-76.22473 17.97417,17.97417 5.0676,52.75807 -76.22473,134.0504 z"
+ id="path859"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- sodipodi:nodetypes="cssssssc"
- id="path11230-8"
- d="m 882.02396,261.21653 c -32.02792,10.55028 -50.67364,35.90531 -39.8694,64.09364 12.48178,32.56527 52.7199,28.43648 88.06751,16.06296 40.18424,-14.06663 41.54557,-60.95866 27.20188,-96.51388 -16.09802,-39.90377 -61.60819,-50.57769 -105.14102,-34.75998 -17.33878,6.30024 -48.03017,23.6621 -60.22994,39.69461 -3.89431,5.11763 -39.07551,36.95572 -89.41275,76.95201 -86.08742,68.40199 -96.50875,70.14982 -97.94241,75.73194"
- style="fill:none;stroke:#2a2a2a;stroke-width:13.68166351;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 663.38703,544.51967 c 21.95617,13.53493 44.17861,26.89165 67.47951,38.02135 18.15625,8.67229 38.24435,16.38995 56.87946,23.87758 23.72965,8.3034 47.40714,17.99104 72.33924,22.25938 6.35941,1.08889 17.11901,2.52837 23.96429,-0.29569 1.30437,-0.53838 1.83659,-2.14341 2.7548,-3.21485 -3.57912,-0.4332 -2.6043,0.54059 -2.26055,-3.46061 0,0 16.95449,0.71436 16.95449,0.71436 l 0,0 c -1.87439,13.64267 0.81662,7.12113 -9.5929,18.86564 -3.04229,0.67109 -6.01155,1.99992 -9.12704,2.01292 -5.84173,0.0239 -21.59018,-5.11096 -25.59617,-6.52701 -23.82867,-8.42243 -46.59479,-19.62361 -70.31349,-28.33028 -28.04365,-10.60757 -56.00726,-21.41112 -84.18225,-31.66673 -3.64018,-1.32506 -29.26423,-10.62996 -35.35,-12.49084 -2.60944,-0.79798 -5.31294,-1.24691 -7.96923,-1.87046 0,0 4.01984,-17.89476 4.01984,-17.89476 z"
- id="path11506"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 564.33059,618.3331 c 22.11111,15.54272 46.05094,28.53978 70.57584,39.81844 5.77315,2.41447 11.52834,4.87238 17.31944,7.24324 5.95392,2.43756 11.84713,5.04323 17.91495,7.18168 18.14547,6.39515 37.31793,10.22122 56.00127,14.70488 7.66259,2.35683 15.45891,4.12365 23.33647,5.55253 0,0 -4.94763,16.17275 -4.94763,16.17275 l 0,0 c -7.78846,-2.48254 -15.23299,-5.66386 -22.86411,-8.60115 -30.53389,-10.5265 -61.32208,-20.49034 -90.90645,-33.56745 -19.31201,-8.00206 -15.32056,-6.18291 -33.80414,-14.46579 -8.37643,-3.75374 -16.57534,-7.90458 -25.02018,-11.50166 -7.34158,-3.12729 -9.64591,-3.68174 -16.57858,-5.81967 0,0 8.97312,-16.7178 8.97312,-16.7178 z"
- id="path11508"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 469.79166,704.04343 c 0.90897,20.28563 11.74605,39.86973 23.98567,55.60433 3.64855,4.69008 7.95263,8.83135 11.92887,13.2471 4.71829,4.04841 9.43675,8.09681 14.15505,12.14522 0,0 -6.07175,7.13755 -6.07175,7.13755 l 0,0 c -5.13986,-4.20352 -10.27972,-8.40704 -15.41958,-12.61039 -4.21566,-4.67639 -8.64869,-9.16552 -12.64699,-14.02901 -14.63322,-17.7995 -27.63132,-38.13165 -34.6507,-60.16939 0,0 18.71943,-1.32541 18.71943,-1.32541 z"
- id="path11510"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- d="m 452.89497,132.28823 c -1.38749,32.72209 3.86832,65.24751 8.79988,97.48237 2.82561,19.37683 5.283,39.55027 13.53972,57.58766 1.57031,3.42999 3.9882,6.40422 5.9823,9.60641 0,0 -12.18386,6.09467 -12.18386,6.09467 l 0,0 c -1.37398,-4.10245 -3.02998,-8.1211 -4.1216,-12.30751 -5.06359,-19.42061 -7.09035,-39.59577 -11.19861,-59.20758 -5.54604,-31.66159 -10.51539,-63.57561 -18.96142,-94.61708 0,0 18.14359,-4.63894 18.14359,-4.63894 z"
- id="path11512"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="opacity:1;vector-effect:none;fill:#545454;fill-opacity:1;stroke:none;stroke-width:376.065979;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 395.6532,631.88697 C 326.09196,701.4482 211.30036,798.56787 195.92,783.18751 c -15.38037,-15.38037 81.7393,-130.17197 151.30054,-199.7332 69.56123,-69.56123 92.7325,-75.06057 108.11286,-59.68021 15.38037,15.38036 9.88103,38.55163 -59.6802,108.11287 z"
+ id="path859-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
<path
- d="m 352.69594,232.48743 c 0.18556,2.09757 0.14708,4.22764 0.56078,6.29289 0.49698,2.49211 1.43606,4.87511 2.15418,7.31284 0.88212,3.76486 1.92757,7.49516 2.6462,11.29473 0.78635,4.157 3.93587,26.81726 4.51392,30.06529 1.21151,6.80662 2.73394,13.55425 4.10091,20.33129 14.07587,52.32091 34.38493,103.48452 65.10266,148.41322 4.9266,7.20596 10.66263,13.82378 15.99404,20.73559 2.21335,2.44833 14.95183,18.11076 20.99143,20.51771 0.95173,0.37932 2.57626,-2.79397 1.5621,-2.64741 -4.34119,0.62697 -8.3087,2.81466 -12.46296,4.22199 0,0 17.62506,-1.62709 17.62506,-1.62709 l 0,0 c -4.07389,4.83647 -6.61338,11.58717 -12.22132,14.50941 -2.25645,1.17576 -4.07081,-3.17603 -5.53406,-5.25752 -5.80736,-8.26099 -7.36621,-19.10303 -14.31273,-26.69943 -15.65012,-27.31014 -31.66536,-54.45302 -45.43681,-82.78604 -5.20485,-10.70829 -9.78,-21.71177 -14.77449,-32.5196 -21.80139,-47.17746 -6.21438,-11.58991 -24.49907,-54.28149 -2.31494,-6.71445 -4.87341,-13.34989 -6.94515,-20.14335 -2.8239,-9.25992 -4.30032,-18.89608 -7.13516,-28.15276 -2.49844,-8.15786 -4.31349,-10.86204 -7.55621,-18.51471 -0.89752,-2.11826 -1.67806,-4.28441 -2.51692,-6.42662 0,0 18.1436,-4.63894 18.1436,-4.63894 z"
- id="path11514"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 604.01872,447.53875 a 10.53119,21.904873 50.958237 0 0 -23.14269,6.13989 10.53119,21.904873 50.958237 0 0 -11.56107,18.62504 c -39.46926,25.81318 -90.71475,48.83218 -100.57931,52.69223 l 2.73112,6.92021 c 10.82934,-4.23757 60.24371,-29.10021 100.18915,-55.21799 a 10.53119,21.904873 50.958237 0 0 22.48558,-6.63273 10.53119,21.904873 50.958237 0 0 10.37006,-21.99274 10.53119,21.904873 50.958237 0 0 -0.4924,-0.5344 z"
+ id="path957"
inkscape:connector-curvature="0" />
<path
- d="m 183.97393,379.56515 c 15.7163,26.65445 33.89494,52.41104 58.37995,71.81711 8.39511,6.65373 17.58258,12.2415 26.37387,18.36216 0,0 -0.89507,1.36474 -0.89507,1.36474 l 0,0 c -9.51898,-5.36355 -19.37866,-10.16291 -28.55697,-16.09066 -13.00719,-8.40054 -27.92025,-20.95774 -38.79658,-32.26854 -10.32283,-10.73515 -18.60095,-23.58959 -30.4726,-32.89124 0,0 13.9674,-10.29357 13.9674,-10.29357 z"
- id="path11520"
- style="fill:#2a2a2a;fill-opacity:1;fill-rule:evenodd;stroke:none"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:792.6194458;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 531.56877,375.0888 a 10.53119,21.904873 39.041763 0 1 -6.13989,23.14268 10.53119,21.904873 39.041763 0 1 -18.62505,11.56108 c -25.81317,39.46926 -48.83218,90.71475 -52.69222,100.57931 l -6.92021,-2.73111 c 4.23757,-10.82935 29.10021,-60.24372 55.21801,-100.18916 a 10.53119,21.904873 39.041763 0 1 6.63271,-22.48558 10.53119,21.904873 39.041763 0 1 21.99275,-10.37005 10.53119,21.904873 39.041763 0 1 0.53439,0.49238 z"
+ id="path957-6"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</g>
</svg>
diff --git a/src/activities/algebra_by/Algebra.qml b/src/activities/algebra_by/Algebra.qml
index 922fc8fcf..fca81bdfb 100644
--- a/src/activities/algebra_by/Algebra.qml
+++ b/src/activities/algebra_by/Algebra.qml
@@ -1,179 +1,238 @@
/* GCompris - Algebra.qml
*
* Copyright (C) 2014 Aruna Sankaranarayanan <aruna.evam@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "algebra.js" as Activity
ActivityBase {
id: activity
+ property int speedSetting: 5
property alias operand: operand
onStart: {
focus = true;
}
pageComponent: Image {
id: background
source: "qrc:/gcompris/src/activities/algebra_by/resource/background.svg"
fillMode: Image.PreserveAspectCrop
sourceSize.width: Math.max(parent.width, parent.height)
signal start
signal stop
Component.onCompleted: {
+ dialogActivityConfig.getInitialConfiguration()
activity.start.connect(start)
activity.stop.connect(stop)
}
Item {
id: coreItems
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias score: score
property alias balloon: balloon
property alias timer: timer
property GCSfx audioEffects: activity.audioEffects
}
- onStart: Activity.start(coreItems, otherItems, operand)
+ onStart: Activity.start(coreItems, otherItems, operand, speedSetting)
onStop: Activity.stop()
+ DialogActivityConfig {
+ id: dialogActivityConfig
+ currentActivity: activity
+ content: Component {
+ Item {
+ property alias speedSlider: speedSlider
+ height: column.height
+
+ Column {
+ id: column
+ spacing: 10 * ApplicationInfo.ratio
+ width: parent.width
+ GCText {
+ id: speedSliderText
+ text: qsTr("Speed")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ Flow {
+ width: dialogActivityConfig.width
+ spacing: 5
+ GCSlider {
+ id: speedSlider
+ width: 250 * ApplicationInfo.ratio
+ value: activity.speedSetting
+ maximumValue: 5
+ minimumValue: 1
+ scrollEnabled: false
+ }
+ }
+ }
+ }
+ }
+
+ onClose: home()
+ onLoadData: {
+ if(dataToSave) {
+ if(dataToSave["speedSetting"]) {
+ activity.speedSetting = dataToSave["speedSetting"];
+ }
+ }
+ }
+ onSaveData: {
+ var oldSpeed = activity.speedSetting
+ activity.speedSetting = dialogActivityConfig.configItem.speedSlider.value
+ if(oldSpeed != activity.speedSetting) {
+ dataToSave = {"speedSetting": activity.speedSetting};
+ background.stop();
+ background.start();
+ }
+ }
+ }
+
DialogHelp {
id: dialogHelpLeftRight
onClose: home()
}
Timer {
id: timer
interval: 1000
onTriggered: Activity.run()
}
Item {
width: background.width - 60 * ApplicationInfo.ratio
height: background.height
Bar {
id: bar
- content: BarEnumContent { value: help | home | level }
+ content: BarEnumContent { value: (help | home | level | config) }
onHelpClicked: {
displayDialog(dialogHelpLeftRight)
}
onPreviousLevelClicked: {
Activity.previousLevel()
}
onNextLevelClicked: {
Activity.nextLevel()
}
+ onConfigClicked: {
+ dialogActivityConfig.active = true
+ displayDialog(dialogActivityConfig)
+ }
onHomeClicked: home()
}
}
Balloon {
id: balloon
onTimeout: bonus.bad("smiley")
}
Bonus {
id: bonus
Component.onCompleted: {
loose.connect(Activity.run)
win.connect(Activity.nextLevel)
}
}
Score {
id: score
x: parent.width * 0.25
y: parent.height * 0.65
anchors.right: undefined
anchors.bottom: undefined
currentSubLevel: 0
numberOfSubLevels: 10
}
}
Item {
id: otherItems
property alias iAmReady: iAmReady
property alias firstOp: firstOp
property alias secondOp: secondOp
property alias numpad: numpad
property int result
}
NumPad {
id: numpad
onAnswerChanged: Activity.questionsLeft()
maxDigit: ('' + otherItems.result).length + 1
}
ReadyButton {
id: iAmReady
onClicked: Activity.run()
}
Flow {
id: textFlow
x: parent.width / 2 - width / 2
y: 80
width: parent.width / 2
height: 100
anchors.margins: 4
spacing: 10
AlgebraText {
id: firstOp
visible: !iAmReady.visible
}
AlgebraText {
id: operand
visible: firstOp.visible
}
AlgebraText {
id: secondOp
visible: !iAmReady.visible
}
AlgebraText {
id: equals
visible: firstOp.visible
text: "="
}
AlgebraText {
id: result
visible: !iAmReady.visible
text: numpad.answer
}
}
Keys.onPressed: {
numpad.updateAnswer(event.key, true);
}
Keys.onReleased: {
numpad.updateAnswer(event.key, false);
}
}
diff --git a/src/activities/algebra_by/algebra.js b/src/activities/algebra_by/algebra.js
index 18c6e56d5..c27ba7199 100644
--- a/src/activities/algebra_by/algebra.js
+++ b/src/activities/algebra_by/algebra.js
@@ -1,171 +1,171 @@
/* GCompris - algebra.js
*
* Copyright (C) 2014 Aruna Sankaranarayanan and Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import "qrc:/gcompris/src/core/core.js" as Core
var currentLevel
var coreItems
var otherItems
var operand
var secondOperandVal
var firstOperandVal
var operations = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+var speedSetting
var OperandsEnum = {
TIMES_SIGN : "\u00D7",
PLUS_SIGN : "\u002B",
MINUS_SIGN : "\u2212",
DIVIDE_SIGN : "\u2215"
}
var nbLevel = operations.length
-function start(coreItems_, otherItems_, operand_) {
+function start(coreItems_, otherItems_, operand_, speedSetting_) {
operand = operand_
coreItems = coreItems_
otherItems = otherItems_
+ speedSetting = speedSetting_
currentLevel = 0
coreItems.score.numberOfSubLevels = 10
// for multiplication and addition, the first levels will display
// currentLevel * N (N behind random)
// where the last levels will do:
// N * currentLevel
if(operand.text === OperandsEnum.TIMES_SIGN || operand.text === OperandsEnum.PLUS_SIGN)
nbLevel = 2 * operations.length
else
nbLevel = operations.length
initLevel()
}
function stop() {
coreItems.balloon.stopMoving()
}
function initLevel() {
coreItems.bar.level = currentLevel + 1
coreItems.score.visible = false
coreItems.score.currentSubLevel = 1
operations = Core.shuffle(operations)
calculateOperands()
otherItems.iAmReady.visible = true
otherItems.firstOp.visible = false
otherItems.secondOp.visible = false
coreItems.balloon.stopMoving()
}
function nextLevel() {
if(++currentLevel >= nbLevel) {
currentLevel = 0
}
initLevel();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = nbLevel - 1
}
initLevel();
}
function calculateOperands()
{
switch(operand.text)
{
case OperandsEnum.TIMES_SIGN:
firstOperandVal = coreItems.bar.level
secondOperandVal = operations[coreItems.score.currentSubLevel - 1]
break;
case OperandsEnum.PLUS_SIGN:
firstOperandVal = coreItems.bar.level
secondOperandVal = operations[coreItems.score.currentSubLevel - 1]
break;
case OperandsEnum.MINUS_SIGN:
firstOperandVal = coreItems.bar.level + 9
secondOperandVal = operations[coreItems.score.currentSubLevel - 1]
break;
case OperandsEnum.DIVIDE_SIGN:
firstOperandVal = coreItems.bar.level * operations[coreItems.score.currentSubLevel - 1]
secondOperandVal = coreItems.bar.level
break;
}
if(currentLevel < operations.length) {
otherItems.firstOp.text = firstOperandVal
otherItems.secondOp.text = secondOperandVal
} else {
otherItems.firstOp.text = secondOperandVal
// Don't forget to remove the first operations.length levels
firstOperandVal -= operations.length
otherItems.secondOp.text = firstOperandVal
}
}
// Return the expected answer
function getAnswer() {
switch(operand.text)
{
case OperandsEnum.TIMES_SIGN:
return (firstOperandVal * secondOperandVal)
case OperandsEnum.PLUS_SIGN:
return (firstOperandVal + secondOperandVal)
case OperandsEnum.MINUS_SIGN:
return (firstOperandVal - secondOperandVal)
case OperandsEnum.DIVIDE_SIGN:
return (firstOperandVal / secondOperandVal)
}
}
function validateAnswer(screenAnswer)
{
return (getAnswer() === screenAnswer)
}
function run() {
calculateOperands()
otherItems.numpad.resetText()
coreItems.score.visible = true
otherItems.iAmReady.visible = false
otherItems.firstOp.visible = true
otherItems.secondOp.visible = true
otherItems.numpad.answerFlag = false
otherItems.result = getAnswer()
-
- // TODO adjusting or disabling the difficulty
- coreItems.balloon.startMoving(20000)
+ coreItems.balloon.startMoving(100000 / speedSetting)
}
function questionsLeft() {
if(validateAnswer(parseInt(otherItems.numpad.answer))) {
otherItems.numpad.answerFlag = true
if(coreItems.score.currentSubLevel < coreItems.score.numberOfSubLevels) {
coreItems.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/win.wav")
coreItems.score.currentSubLevel++
coreItems.timer.start()
} else {
coreItems.score.currentSubLevel = 1
coreItems.balloon.stopMoving()
coreItems.bonus.good("smiley");
}
}
}
diff --git a/src/activities/babymatch/Babymatch.qml b/src/activities/babymatch/Babymatch.qml
index ca60ee468..d12e2dfc1 100644
--- a/src/activities/babymatch/Babymatch.qml
+++ b/src/activities/babymatch/Babymatch.qml
@@ -1,316 +1,316 @@
/* GCompris - Babymatch.qml
*
* Copyright (C) 2015 Pulkit Gupta <pulkitgenius@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Pulkit Gupta <pulkitgenius@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "babymatch.js" as Activity
ActivityBase {
id: activity
// In most cases, these 3 are the same.
// But for imageName for example, we reuse the images of babymatch, so we need to differentiate them
property string imagesUrl: boardsUrl
property string soundsUrl: boardsUrl
property string boardsUrl: "qrc:/gcompris/src/activities/babymatch/resource/"
property int levelCount: 7
property bool answerGlow: true //For highlighting the answers
property bool displayDropCircle: true //For displaying drop circles
onStart: focus = true
onStop: {}
pageComponent: Image {
id: background
anchors.fill: parent
source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW01.svg"
signal start
signal stop
property bool vert: background.width >= background.height
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias availablePieces: availablePieces
property alias backgroundPiecesModel: backgroundPiecesModel
property alias file: file
property alias grid: grid
property alias backgroundImage: backgroundImage
property alias leftWidget: leftWidget
property alias instruction: instruction
property alias toolTip: toolTip
property alias score: score
property alias dataset: dataset
}
Loader {
id: dataset
asynchronous: false
}
onStart: { Activity.start(items, imagesUrl, soundsUrl, boardsUrl, levelCount, answerGlow, displayDropCircle) }
onStop: { Activity.stop() }
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level }
onHelpClicked: {displayDialog(dialogHelp)}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
}
Score {
id: score
visible: numberOfSubLevels > 1
}
Bonus {
id: bonus
Component.onCompleted: win.connect(Activity.nextSubLevel)
}
File {
id: file
name: ""
}
Image {
id: leftWidget
source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW02.svg"
width: background.vert ?
90 * ApplicationInfo.ratio :
background.width
height: background.vert ?
background.height :
90 * ApplicationInfo.ratio
anchors.left: parent.left
ListWidget {
id: availablePieces
vert: background.vert
}
MouseArea {
anchors.fill: parent
onPressed: (instruction.opacity == 0 ?
instruction.show() : instruction.hide())
}
}
Rectangle {
id: toolTip
anchors {
bottom: bar.top
bottomMargin: 10
left: leftWidget.left
leftMargin: 5
}
width: toolTipTxt.width + 10
height: toolTipTxt.height + 5
opacity: 1
radius: 10
z: 100
color: "#E8E8E8"
property alias text: toolTipTxt.text
Behavior on opacity { NumberAnimation { duration: 120 } }
function show(newText) {
if(newText) {
text = newText
opacity = 0.8
} else {
opacity = 0
}
}
Rectangle {
width: parent.width - anchors.margins
height: parent.height - anchors.margins
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: parent.height/8
radius: 10
color: "#87A6DD" //light blue
}
Rectangle {
width: parent.width - anchors.margins
height: parent.height - anchors.margins
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: parent.height/4
radius: 10
color: "#E8E8E8" //paper white
}
GCText {
id: toolTipTxt
anchors.centerIn: parent
fontSize: regularSize
color: "#373737"
horizontalAlignment: Text.AlignHCenter
wrapMode: TextEdit.WordWrap
}
}
Rectangle {
id: grid
color: "transparent"
z: 2
x: background.vert ? 90 * ApplicationInfo.ratio : 0
y: background.vert ? 0 : 90 * ApplicationInfo.ratio
width: background.vert ?
background.width - 90 * ApplicationInfo.ratio : background.width
height: background.vert ?
background.height - (bar.height * 1.1) :
background.height - (bar.height * 1.1) - 90 * ApplicationInfo.ratio
Image {
id: backgroundImage
fillMode: Image.PreserveAspectFit
property double ratio: sourceSize.width / sourceSize.height
property double gridRatio: grid.width / grid.height
property alias instruction: instruction
source: ""
z: 2
width: source == "" ? grid.width : (ratio > gridRatio ? grid.width : grid.height * ratio)
height: source == "" ? grid.height : (ratio < gridRatio ? grid.height : grid.width / ratio)
anchors.topMargin: 10
anchors.centerIn: parent
//Inserting static background images
Repeater {
id: backgroundPieces
model: backgroundPiecesModel
delegate: piecesDelegate
z: 2
Component {
id: piecesDelegate
Image {
id: shapeBackground
source: Activity.imagesUrl + imgName
x: posX * backgroundImage.width - width / 2
y: posY * backgroundImage.height - height / 2
height:
imgHeight ?
imgHeight * backgroundImage.height :
(backgroundImage.source == "" ?
backgroundImage.height * shapeBackground.sourceSize.height / backgroundImage.height :
backgroundImage.height * shapeBackground.sourceSize.height /
backgroundImage.sourceSize.height)
width:
imgWidth ?
imgWidth * backgroundImage.width :
(backgroundImage.source == "" ?
backgroundImage.width * shapeBackground.sourceSize.width / backgroundImage.width :
backgroundImage.width * shapeBackground.sourceSize.width /
backgroundImage.sourceSize.width)
fillMode: Image.PreserveAspectFit
}
}
}
MouseArea {
anchors.fill: parent
onPressed: (instruction.opacity == 0 ?
instruction.show() : instruction.hide())
}
}
}
Rectangle {
id: instruction
anchors.horizontalCenter: instructionTxt.horizontalCenter
anchors.verticalCenter: instructionTxt.verticalCenter
width: instructionTxt.width + 40
height: instructionTxt.height + 40
opacity: 0.8
radius: 10
z: 3
color: "#87A6DD" //light blue
property alias text: instructionTxt.text
Behavior on opacity { PropertyAnimation { duration: 200 } }
function show() {
if(text)
opacity = 1
}
function hide() {
opacity = 0
}
Rectangle {
id: insideFill
width: parent.width - anchors.margins
height: parent.height - anchors.margins
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: parent.height/8
radius: 10
color: "#E8E8E8" //paper white
}
}
GCText {
id: instructionTxt
anchors {
top: background.vert ? grid.top : leftWidget.bottom
- topMargin: -10
+ topMargin: 20
horizontalCenter: background.vert ? grid.horizontalCenter : leftWidget.horizontalCenter
}
opacity: instruction.opacity
z: instruction.z
fontSize: regularSize
color: "#373737"
horizontalAlignment: Text.AlignHCenter
width: Math.max(Math.min(parent.width * 0.9, text.length * 11), parent.width * 0.3)
wrapMode: TextEdit.WordWrap
}
ListModel {
id: backgroundPiecesModel
}
}
}
diff --git a/src/activities/balancebox/Balancebox.qml b/src/activities/balancebox/Balancebox.qml
index 6cf717bb8..f8135c67f 100644
--- a/src/activities/balancebox/Balancebox.qml
+++ b/src/activities/balancebox/Balancebox.qml
@@ -1,609 +1,615 @@
/* GCompris - balancebox.qml
*
* Copyright (C) 2014-2016 Holger Kaelberer <holger.k@elberer.de>
*
* Authors:
* Holger Kaelberer <holger.k@elberer.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Window 2.2
import QtSensors 5.0
import QtGraphicalEffects 1.0
import GCompris 1.0
import Box2D 2.0
import QtQuick.Controls 1.5
import "../../core"
import "editor/"
import "balancebox.js" as Activity
import "qrc:/gcompris/src/core/core.js" as Core
ActivityBase {
id: activity
property string mode: "play" // "play" or "test"
property string levelSet: "builtin" // "builtin" or "user"
// When the user launches the activity in "user" mode by default(due to previously save config mode) for the first time after updating GCompris, default user file must be loaded as they must be having created levels in it.
// From next time onwards, the saved file path is loaded. Refer to line 567.
property string loadedFilePath: (levelSet == "builtin") ? Activity.builtinFile : Activity.userFile
property var testLevel
property bool inForeground: false // to avoid unneeded reconfigurations
property bool alwaysStart: true // enforce start signal for editor-to-testing- and returning from config-transition
property bool needRestart: true
- onWidthChanged: if (inForeground && pageView.currentItem === activity)
- Activity.reconfigureScene();
-
- onHeightChanged: if (inForeground && pageView.currentItem === activity)
- Activity.reconfigureScene();
-
onStart: {
inForeground = true;
focus = true;
}
onStop: inForeground = false;
Keys.onPressed: Activity.processKeyPress(event.key)
Keys.onReleased: Activity.processKeyRelease(event.key)
pageComponent: Image {
id: background
source: Activity.baseUrl + "/maze_bg.svg"
sourceSize.width: parent.width
anchors.fill: parent
signal start
signal stop
function startEditor() {
editorLoader.active = true;
if (activity.mode == "test")
displayDialogs([dialogActivityConfig, editorLoader.item]);
else
displayDialog(editorLoader.item);
}
function handleBackEvent() {
if (activity.mode == "test") {
startEditor();
return true;
} else
return false;
}
Keys.onEscapePressed: event.accepted = handleBackEvent();
Keys.onReleased: {
if (event.key === Qt.Key_Back)
event.accepted = handleBackEvent();
}
Component.onCompleted: {
dialogActivityConfig.getInitialConfiguration()
activity.start.connect(start)
activity.stop.connect(stop)
items.dpi = Math.round(Screen.pixelDensity*25.4);
}
onStart: if (activity.needRestart) {
Activity.start(items);
activity.needRestart = false;
} else
Activity.initLevel();
onStop: {
Activity.stop();
activity.needRestart = true;
}
QtObject {
id: items
property string mode: activity.mode
property string levelSet: activity.levelSet
property string filePath: activity.loadedFilePath
property var testLevel: activity.testLevel
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias tilt: tilt
property alias timer: timer
property alias ball: ball
property alias file: file
property int ballSize: cellSize - 2*wallSize
property alias mapWrapper: mapWrapper
property int cellSize: mapWrapper.length / Math.min(mapWrapper.rows, mapWrapper.columns)
property int wallSize: cellSize / 5
property var world: physicsWorld
property alias keyboardTimer: keyboardTimer
property var ballType: Fixture.Category1
property var wallType: Fixture.Category2
property var holeType: Fixture.Category3
property var goalType: Fixture.Category4
property var buttonType: Fixture.Category5
property alias parser: parser
property double dpi
property GCSfx audioEffects: activity.audioEffects
property Loading loading: activity.loading
}
Loader {
id: editorLoader
active: false
sourceComponent: BalanceboxEditor {
id: editor
visible: true
testBox: activity
onClose: activity.home()
}
}
JsonParser {
id: parser
onError: console.error("Balancebox: Error parsing JSON: " + msg);
}
Rectangle {
id: mapWrapper
property double margin: 20
+ property int barHeight: ApplicationSettings.isBarHidden ? 0 : bar.height
property int columns: 0
property int rows: 0
property double length: Math.min(background.height -
- 2*mapWrapper.margin, background.width - 2*mapWrapper.margin);
+ mapWrapper.barHeight - 2 * mapWrapper.margin, background.width - 2 * mapWrapper.margin);
color: "#E3DEDB"
-
width: length
height: length
-
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
+ anchors.top: background.top
+ anchors.topMargin: mapWrapper.margin
+ anchors.horizontalCenter: background.horizontalCenter
+
+ onWidthChanged: if (activity.inForeground && pageView.currentItem === activity)
+ resizeTimer.restart()
+
+ onHeightChanged: if (activity.inForeground && pageView.currentItem === activity)
+ resizeTimer.restart()
transform: [
Rotation {
origin.x: mapWrapper.width / 2
origin.y: mapWrapper.height / 2
axis { x: 1; y: 0; z: 0 }
angle: ApplicationInfo.isMobile ? 0 : -items.tilt.xRotation
},
Rotation {
origin.x: mapWrapper.width / 2
origin.y: mapWrapper.height / 2
axis { x: 0; y: 1; z: 0 }
angle: ApplicationInfo.isMobile ? 0 : items.tilt.yRotation
}
]
+
+ Timer {
+ id: resizeTimer
+ interval: 100
+ onTriggered: Activity.reconfigureScene()
+ }
// right:
Wall {
id: rightWall
width: items.wallSize
height: parent.height + items.wallSize
anchors.left: mapWrapper.right
anchors.leftMargin: - items.wallSize/2
anchors.top: parent.top
anchors.topMargin: -items.wallSize/2
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
// bottom:
Wall {
id: bottomWall
width: parent.width + items.wallSize
height: items.wallSize
anchors.left: mapWrapper.left
anchors.leftMargin: - items.wallSize/2
anchors.top: parent.bottom
anchors.topMargin: -items.wallSize/2
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
// top:
Wall {
id: topWall
width: parent.width + items.wallSize
height: items.wallSize
anchors.left: mapWrapper.left
anchors.leftMargin: - items.wallSize/2
anchors.top: parent.top
anchors.topMargin: -items.wallSize/2
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
// left:
Wall {
id: leftWall
width: items.wallSize
height: parent.height + items.wallSize
anchors.left: mapWrapper.left
anchors.leftMargin: - items.wallSize/2
anchors.top: parent.top
anchors.topMargin: -items.wallSize/2
shadow: false
shadowHorizontalOffset: Math.min(items.tilt.yRotation, items.wallSize)
shadowVerticalOffset: Math.min(items.tilt.xRotation, items.wallSize)
}
BalanceItem {
id: ball
world: physicsWorld
imageSource: Activity.baseUrl + "/ball.svg"
visible: false
scale: 1.0
width: items.ballSize
height: items.ballSize
z: 3 // above other BalanceItems
categories: items.ballType
collidesWith: items.wallType | items.holeType | items.goalType
| items.buttonType
density: 1
friction: Activity.friction
linearDamping: Activity.friction
restitution: Activity.restitution
bodyType: Body.Dynamic
shadow: true
shadowHorizontalOffset: (items.tilt.yRotation > 0) ? Math.min(items.tilt.yRotation, items.wallSize) : Math.max(items.tilt.yRotation, -items.wallSize)
shadowVerticalOffset: (items.tilt.xRotation > 0) ? Math.min(items.tilt.xRotation, items.wallSize) : Math.max(items.tilt.xRotation, -items.wallSize)
Behavior on scale {
NumberAnimation {
id: fallAnimation
duration: 1000
}
}
onBeginContact: {
if (other.categories !== items.wallType)
Activity.addBallContact(other);
else {
// sound-effect on each contact with a wall might be too annoying:
//items.audioEffects.stop();
//items.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/brick.wav");
}
}
onEndContact: {
if (other.categories !== items.wallType)
Activity.removeBallContact(other);
}
}
World {
id: physicsWorld
gravity: Qt.point(0, 0) // we calculate acceleration ourselves
pixelsPerMeter: Activity.box2dPpm // default: 32
timeStep: Activity.step/1000 // default: 1/60
}
DebugDraw {
id: debugDraw
world: physicsWorld
visible: Activity.debugDraw
z: 100
}
}
Timer {
id: timer
interval: Activity.step;
running: false;
repeat: true
onTriggered: Activity.moveBall()
}
Item {
id: tilt
property double xRotation: 0
property double yRotation: 0
property bool swapAxes: false
property bool invertX: false
property bool invertY: false
onXRotationChanged: {
if (xRotation > 90)
xRotation = 90;
else if (xRotation < -90)
xRotation = -90;
}
onYRotationChanged: {
if (yRotation > 90)
yRotation = 90;
else if (yRotation < -90)
yRotation = -90;
}
TiltSensor {
id: tiltSensor
active: ApplicationInfo.isMobile ? true : false
onReadingChanged: {
if (!tilt.swapAxes) {
tilt.xRotation = tilt.invertX ? -reading.xRotation : reading.xRotation;
tilt.yRotation = tilt.invertY ? -reading.yRotation : reading.yRotation;
} else {
tilt.xRotation = tilt.invertX ? -reading.yRotation : reading.yRotation;
tilt.yRotation = tilt.invertY ? -reading.xRotation : reading.xRotation;
}
tiltText.text = "X/Y Rotation: "
+ tiltSensor.reading.xRotation
+ "/" + tiltSensor.reading.yRotation
}
}
}
Item {
id: textWrapper
anchors.left: parent.left
anchors.top: parent.top
width: parent.width
height: parent.height / 3
visible: Activity.debugDraw
Text {
id: tiltText
anchors.left: parent.left
anchors.top: parent.top
text: "X/Y Rotation: " + tilt.xRotation + "/" + tilt.yRotation
font.pointSize: 12
}
Text {
id: posText
anchors.left: parent.left
anchors.top: tiltText.bottom
text: "X/Y = " + ball.x + "/" + ball.y
font.pointSize: 12
}
}
MultiPointTouchArea {
anchors.fill: parent
touchPoints: [ TouchPoint { id: point1 } ]
property real startX
property real startY
property int offset: 30
function reset() {
startX = point1.x
startY = point1.y
}
onPressed: {
reset()
}
onUpdated: {
var moveX = point1.x - startX
var moveY = point1.y - startY
// Find the direction with the most move
if(Math.abs(moveX) * ApplicationInfo.ratio > offset &&
Math.abs(moveX) > Math.abs(moveY)) {
if(moveX > offset * ApplicationInfo.ratio) {
Activity.processKeyPress(Qt.Key_Right)
reset()
} else if(moveX < -offset * ApplicationInfo.ratio) {
Activity.processKeyPress(Qt.Key_Left)
reset()
}
} else if(Math.abs(moveY) * ApplicationInfo.ratio > offset &&
Math.abs(moveX) < Math.abs(moveY)) {
if(moveY > offset * ApplicationInfo.ratio) {
Activity.processKeyPress(Qt.Key_Down)
reset()
} else if(moveY < -offset * ApplicationInfo.ratio) {
Activity.processKeyPress(Qt.Key_Up)
reset()
}
}
}
onReleased: {
Activity.keyboardIsTilting = false
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent {
value: activity.mode == "play"
? (help | home | level | config )
: ( help | home )
}
onHelpClicked: {
// stop everything or the ball keeps moving while we're away:
items.timer.stop();
displayDialog(dialogHelp);
}
onPreviousLevelClicked: if (!Activity.finishRunning)
Activity.previousLevel()
onNextLevelClicked: if (!Activity.finishRunning)
Activity.nextLevel()
onHomeClicked: {
if (activity.mode == "test")
background.startEditor();
else
activity.home()
}
onConfigClicked: {
items.timer.stop();
dialogActivityConfig.active = true
// Set default values
dialogActivityConfig.setDefaultValues();
displayDialog(dialogActivityConfig)
}
}
Bonus {
id: bonus
looseSound: "qrc:/gcompris/src/core/resource/sounds/crash.wav"
Component.onCompleted: {
win.connect(Activity.nextLevel);
loose.connect(Activity.initLevel);
}
}
Timer {
id: keyboardTimer
interval: Activity.keyboardTimeStep;
running: false
repeat: false
onTriggered: Activity.keyboardHandler()
}
GCCreationHandler {
id: creationHandler
readonly property bool isEditorActive: editorLoader.active && editorLoader.item.visible
onFileLoaded: {
if(!isEditorActive)
activity.loadedFilePath = filePath
else
editorLoader.item.filename = filePath
close()
}
parent: isEditorActive ? editorLoader.item : dialogActivityConfig
}
File {
id: file
}
DialogActivityConfig {
id: dialogActivityConfig
currentActivity: activity
content: Component {
Item {
property alias levelsBox: levelsBox
property var availableLevels: [
{ "text": qsTr("Built-in"), "value": "builtin" },
{ "text": qsTr("User"), "value": "user" },
]
Flow {
id: flow
spacing: 5
width: dialogActivityConfig.width
GCComboBox {
id: levelsBox
model: availableLevels
background: dialogActivityConfig
label: qsTr("Select your level set")
}
Column {
spacing: 5
Button {
id: editorButton
style: GCButtonStyle {}
height: levelsBox.height
text: qsTr("Start Editor")
visible: levelsBox.currentIndex == 1
onClicked: background.startEditor()
}
Button {
id: loadButton
style: GCButtonStyle {}
height: levelsBox.height
text: qsTr("Load saved levels")
visible: levelsBox.currentIndex == 1
onClicked: creationHandler.loadWindow()
}
}
}
}
}
onClose: home();
onLoadData: {
if(dataToSave && dataToSave["levels"]) {
activity.levelSet = dataToSave["levels"];
if(dataToSave['filePath'])
activity.loadedFilePath = dataToSave["filePath"]
}
}
onSaveData: {
var newLevels = dialogActivityConfig.configItem
.availableLevels[dialogActivityConfig.configItem.levelsBox.currentIndex].value;
var initialFilePath = dataToSave['filePath'] ? dataToSave['filePath'] : ""
if(newLevels === "builtin")
activity.loadedFilePath = Activity.builtinFile
if (newLevels !== activity.levelSet || initialFilePath != activity.loadedFilePath) {
activity.levelSet = newLevels;
dataToSave = {"levels": activity.levelSet, "filePath": activity.loadedFilePath};
activity.needRestart = true;
}
}
dataValidationFunc: function() {
var newLevels = dialogActivityConfig.configItem
.availableLevels[dialogActivityConfig.configItem.levelsBox.currentIndex].value
if (newLevels === "user" && activity.loadedFilePath === Activity.builtinFile) {
Core.showMessageDialog(dialogActivityConfig,
qsTr("You selected the user-defined level set, but you have not yet defined any user levels!<br/> " +
"Either create your user levels by starting the level editor or choose the 'built-in' level set."),
qsTr("Ok"), null,
"", null,
null);
return false;
}
return true;
}
function setDefaultValues() {
for(var i = 0 ;
i < dialogActivityConfig.configItem.availableLevels.length;
i ++) {
if(dialogActivityConfig.configItem.availableLevels[i].value === activity.levelSet) {
dialogActivityConfig.configItem.levelsBox.currentIndex = i;
break;
}
}
}
}
}
}
diff --git a/src/activities/binary_bulb/BinaryBulb.qml b/src/activities/binary_bulb/BinaryBulb.qml
index 7000e547e..45dbb73ec 100644
--- a/src/activities/binary_bulb/BinaryBulb.qml
+++ b/src/activities/binary_bulb/BinaryBulb.qml
@@ -1,209 +1,209 @@
/* GCompris - BinaryBulb.qml
*
* Copyright (C) 2018 Rajat Asthana <rajatasthana4@gmail.com>
*
* Authors:
* RAJAT ASTHANA <rajatasthana4@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "binary_bulb.js" as Activity
import "numbers.js" as Dataset
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
property var dataset: Dataset
pageComponent: Image {
id: background
anchors.fill: parent
source: "../digital_electricity/resource/texture01.png"
fillMode: Image.Tile
signal start
signal stop
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias bulbs: bulbs
property int numberSoFar: 0
property int numberToConvert: 0
property int numberOfBulbs: 0
property int currentSelectedBulb: -1
property int currentLevel: 0
property alias score: score
}
onStart: { Activity.start(items, dataset) }
onStop: { Activity.stop() }
// Tutorial section starts
Image {
id: tutorialImage
source: "../digital_electricity/resource/texture01.png"
anchors.fill: parent
fillMode: Image.Tile
z: 5
visible: true
Tutorial {
id: tutorialSection
tutorialDetails: Activity.tutorialInstructions
useImage: false
onSkipPressed: {
Activity.initLevel()
tutorialImage.visible = false
}
}
}
// Tutorial section ends
Keys.onPressed: {
if(event.key === Qt.Key_Enter || event.key === Qt.Key_Return) {
Activity.equalityCheck()
}
else if(event.key === Qt.Key_Space) {
if(items.currentSelectedBulb != -1) {
Activity.changeState(items.currentSelectedBulb)
}
}
else if(event.key === Qt.Key_Left) {
if(--items.currentSelectedBulb < 0) {
items.currentSelectedBulb = items.numberOfBulbs-1
}
}
else if(event.key === Qt.Key_Right) {
if(++items.currentSelectedBulb >= items.numberOfBulbs) {
items.currentSelectedBulb = 0
}
}
}
Rectangle {
id: questionItemBackground
opacity: 0
z: 10
anchors {
horizontalCenter: parent.horizontalCenter
bottomMargin: 10
}
height: background.height / 6
width: parent.width - 20 * ApplicationInfo.ratio
}
GCText {
id: questionItem
anchors.fill: questionItemBackground
anchors.bottom: questionItemBackground.bottom
fontSizeMode: Text.Fit
wrapMode: Text.Wrap
z: 4
color: "white"
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: qsTr("What is the binary representation of %1?").arg(items.numberToConvert)
}
Row {
- id: row
+ id: bulbsRow
anchors.top: questionItem.bottom
anchors.topMargin: 30 * ApplicationInfo.ratio
anchors.horizontalCenter: parent.horizontalCenter
spacing: 10 * ApplicationInfo.ratio
Repeater {
id: bulbs
model: items.numberOfBulbs
LightBulb {
height: background.height / 5
- width: (background.width >= background.height) ? (background.width / 20) : ((background.width - (16 * row.spacing)) / 8)
+ width: (background.width >= background.height) ? (background.width / 20) : ((background.width - (16 * bulbsRow.spacing)) / 8)
valueVisible: Dataset.get()[items.currentLevel].bulbValueVisible
}
}
}
GCText {
id: reachedSoFar
- anchors.horizontalCenter: row.horizontalCenter
- anchors.top: row.bottom
+ anchors.horizontalCenter: bulbsRow.horizontalCenter
+ anchors.top: bulbsRow.bottom
anchors.topMargin: 30 * ApplicationInfo.ratio
color: "white"
fontSize: largeSize
text: items.numberSoFar
visible: Dataset.get()[items.currentLevel].enableHelp
}
BarButton {
id: okButton
anchors {
bottom: bar.top
right: parent.right
rightMargin: 10 * ApplicationInfo.ratio
bottomMargin: 10 * ApplicationInfo.ratio
}
source: "qrc:/gcompris/src/core/resource/bar_ok.svg"
sourceSize.width: 60 * ApplicationInfo.ratio
onClicked: Activity.equalityCheck()
enabled: !bonus.isPlaying && !score.isWinAnimationPlaying
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level}
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
}
Score {
id: score
visible: !tutorialImage.visible
anchors.bottom: bar.top
anchors.right: bar.right
anchors.left: parent.left
anchors.bottomMargin: 10 * ApplicationInfo.ratio
anchors.leftMargin: 10 * ApplicationInfo.ratio
anchors.rightMargin: 0
}
Bonus {
id: bonus
Component.onCompleted: win.connect(Activity.nextLevel)
}
}
}
diff --git a/src/activities/calendar/calendar.js b/src/activities/calendar/calendar.js
index edef10d82..7a908d26f 100644
--- a/src/activities/calendar/calendar.js
+++ b/src/activities/calendar/calendar.js
@@ -1,145 +1,145 @@
/* GCompris - calendar.js
*
* Copyright (C) 2017 Amit Sagtani <asagtani06@gmail.com>
*
* Authors:
* Amit Sagtani <asagtani06@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import QtQml 2.2 as Qml
.import GCompris 1.0 as GCompris //for ApplicationInfo
.import "qrc:/gcompris/src/core/core.js" as Core
var currentLevel = 0
var numberOfLevel
var currentSubLevel = 1
var currentDataSet
var currentLevelConfig
var dataset
var items
var daySelected = 1
var monthSelected = 2
var yearSelected = 2018
var dayOfWeekSelected
var minRange //sum of min. visible month and year on calendar for navigation bar next/prev button visibility.
var maxRange //sum of max. visible month and year on calendar for navigation bar next/prev button visibility.
var correctAnswer
var mode
function start(items_, dataset_) {
items = items_
dataset = dataset_.get()
numberOfLevel = dataset.length
currentLevel = 0
if(Qt.locale(GCompris.ApplicationSettings.locale).firstDayOfWeek == Qml.Locale.Monday) {
items.daysOfTheWeekModel.move(0, items.daysOfTheWeekModel.count - 1, 1)
}
initLevel();
}
function stop() {
}
function initLevel() {
currentSubLevel = 1;
items.bar.level = currentLevel + 1
currentLevelConfig = dataset[currentLevel][0][0]
setCalendarConfigurations()
initQuestion();
}
function nextLevel() {
if(numberOfLevel <= ++currentLevel) {
currentLevel = 0
}
initLevel();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
initLevel();
}
// Configure calendar properties for every level.
function setCalendarConfigurations() {
minRange = Number(currentLevelConfig["minimumDate"].slice(5,7)) + Number(currentLevelConfig["minimumDate"].slice(0,4)) - 1;
maxRange = Number(currentLevelConfig["maximumDate"].slice(5,7)) + Number(currentLevelConfig["maximumDate"].slice(0,4)) - 1;
mode = currentLevelConfig["mode"]
items.calendar.navigationBarVisible = currentLevelConfig["navigationBarVisible"]
items.calendar.minimumDate = currentLevelConfig["minimumDate"]
items.calendar.maximumDate = currentLevelConfig["maximumDate"]
items.calendar.visibleYear = currentLevelConfig["visibleYear"]
yearSelected = currentLevelConfig["visibleYear"]
items.calendar.visibleMonth = currentLevelConfig["visibleMonth"]
monthSelected = currentLevelConfig["visibleMonth"]
items.answerChoices.visible = (mode === "findDayOfWeek") ? true : false
items.okButton.visible = !items.answerChoices.visible
currentDataSet = dataset[currentLevel][1]
currentDataSet = Core.shuffle(currentDataSet)
items.score.numberOfSubLevels = currentDataSet.length
items.score.currentSubLevel = currentSubLevel
}
function initQuestion() {
if(currentDataSet.length < currentSubLevel) {
items.bonus.good("lion")
}
else {
items.score.currentSubLevel = currentSubLevel
items.questionItem.text = currentDataSet[currentSubLevel-1]["question"]
correctAnswer = currentDataSet[currentSubLevel-1]["answer"]
}
}
function updateScore(isCorrectAnswer) {
if(isCorrectAnswer) {
items.questionDelay.start()
items.okButtonParticles.burst(20)
items.score.playWinAnimation()
currentSubLevel++;
}
else
- items.bonus.bad("lion")
+ items.bonus.bad("lion", items.bonus.checkAnswer)
}
function checkAnswer() {
var isCorrectAnswer = false
// For levels having questions based on day of week only.
if(mode === "findDayOfWeek") {
if(dayOfWeekSelected === correctAnswer["dayOfWeek"]) {
isCorrectAnswer = true
}
}
// For levels having question based on month only.
else if(mode === "findMonthOnly") {
if(correctAnswer["month"].indexOf(monthSelected) >= 0) {
isCorrectAnswer = true
}
}
// For levels having questions based on dayOfWeek, month and year.
else if(mode !== "findDayOfWeek") {
if(monthSelected === correctAnswer["month"] && daySelected === correctAnswer["day"] && yearSelected === correctAnswer["year"]) {
isCorrectAnswer = true
}
}
updateScore(isCorrectAnswer)
}
diff --git a/src/activities/categorization/Zone.qml b/src/activities/categorization/Zone.qml
index 79dbe3fbd..d13441adf 100644
--- a/src/activities/categorization/Zone.qml
+++ b/src/activities/categorization/Zone.qml
@@ -1,119 +1,120 @@
/* GCompris - Zone.qml
*
* Copyright (C) 2016 Divyam Madaan <divyam3897@gmail.com>
*
* Authors:
* Divyam Madaan <divyam3897@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "categorization.js" as Activity
Flow {
id: zoneFlow
width: parent.width/3
height: parent.height
property alias repeater: repeater
property alias model: zoneModel
ListModel {
id: zoneModel
}
Repeater {
id: repeater
model: zoneModel
Item {
id: item
width: horizontalLayout ? middleZone.width * 0.32 : middleZone.width * 0.48
height: horizontalLayout ? categoryBackground.height * 0.2 : categoryBackground.height * 0.15
opacity: 1
Image {
id: image
fillMode: Image.PreserveAspectFit
sourceSize.width: horizontalLayout ? middleZone.width * 0.32 : middleZone.width * 0.48
width: sourceSize.width
height: sourceSize.width
source: name
MultiPointTouchArea {
id: dragArea
anchors.fill: parent
touchPoints: [ TouchPoint { id: point1 } ]
property real positionX
property real positionY
property real lastX
property real lastY
property bool isRight: isRight
property string currPosition: "middle"
property string imageSource: image.source.toString()
onPressed: {
items.instructionsVisible = false
positionX = point1.x
positionY = point1.y
var imagePos = image.mapToItem(null,0,0)
if(Activity.isDragInLeftArea(leftScreen.width, imagePos.x + parent.width)) {
currPosition = "left"
}
else if(Activity.isDragInRightArea(middleScreen.width + leftScreen.width,imagePos.x)) {
currPosition = "right"
}
else
currPosition = "middle"
}
onUpdated: {
var moveX = point1.x - positionX
var moveY = point1.y - positionY
parent.x = parent.x + moveX
parent.y = parent.y + moveY
var imagePos = image.mapToItem(null,0,0)
leftAreaContainsDrag = Activity.isDragInLeftArea(leftScreen.width, imagePos.x + parent.width)
rightAreaContainsDrag = Activity.isDragInRightArea(middleScreen.width + leftScreen.width,imagePos.x)
lastX = 0, lastY = 0
}
onReleased: {
var droppedPosition = "middle";
if(lastX == point1.x && lastY == point1.y)
return;
else if(leftAreaContainsDrag)
droppedPosition = "left"
else if(rightAreaContainsDrag)
droppedPosition = "right"
+ Activity.setValues()
+
// If we drop on same zone, we move it at its initial place
if(currPosition == droppedPosition) {
image.x = 0
image.y = 0
}
else {
Activity.dropControl(currPosition, droppedPosition, imageSource, index)
image.source = ""
}
- Activity.setValues()
lastX = point1.x
lastY = point1.y
}
}
}
}
}
}
diff --git a/src/activities/categorization/categorization.js b/src/activities/categorization/categorization.js
index 1d733e538..7f16c6e3d 100644
--- a/src/activities/categorization/categorization.js
+++ b/src/activities/categorization/categorization.js
@@ -1,305 +1,305 @@
/* GCompris - categorization.js
*
* Copyright (C) 2016 Divyam Madaan <divyam3897@gmail.com>
*
* Authors:
* Divyam Madaan <divyam3897@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris
.import "qrc:/gcompris/src/core/core.js" as Core
var categoryModelIndex = 0;
var currentSubLevel = 0;
var items
var lessons
var categories
var images
var items
var currentLevel = 1
var numberOfLevel
var index
var imagesData = []
var categoriesData = []
var expertCategories = []
var boardsUrl
var answerTable = {}
var totalImages
var fileName = ":/gcompris/data/words/animals/camel.jpg"
function init(items_,boardsUrl_) {
boardsUrl = boardsUrl_
items = items_
items.menuModel.clear()
currentSubLevel = 0
}
function start() {
categoriesData = []
items.categoryReview.stop()
var isEmbeddedMode = items.file.exists(fileName) ? true : false
items.categoriesFallback = !isEmbeddedMode
var categoriesFilename;
var categoryDataset = items.categoryReview.categoryDataset
var categoryLists = items.categories
for(var i = 0; i < categoryLists.length; i++) {
categoriesFilename = "qrc" + boardsUrl + categoryLists[i]
categoryDataset.source = categoriesFilename
if(isEmbeddedMode || categoryDataset.item.isEmbedded) {
categoriesData.push(categoryDataset.item)
}
}
lessons = getAllLessons(categoriesData)
categories = getCategoryModel(categoriesData)
addPropertiesToCategories(categories)
items.menuModel.append(categories)
savedPropertiesToCategories(items.dialogActivityConfig.dataToSave)
sortByFavorites()
items.menuScreen.start()
}
// Inserts specific properties to the categories
function addPropertiesToCategories(categories) {
for (var i = 0; i < categories.length; i++) {
categories[i]['name'] = categories[i].name
categories[i]['image'] = categories[i].image
categories[i]['favorite'] = false
categories[i]['categoryIndex'] = i
}
}
// Return all the properties we have to save
function categoriesToSavedProperties() {
var props = {}
for(var i = 0; i < items.menuModel.count; i++) {
var category = items.menuModel.get(i)
props[category.name] = {
'favorite': category['favorite']
}
}
return props
}
// Update the categories based on a previous saving
function savedPropertiesToCategories(dataToSave) {
var props = dataToSave["data"]
for(var i = 0; i < items.menuModel.count; i++) {
var category = items.menuModel.get(i)
var categoryname = category.name
if(props && props[category.name]) {
category['favorite'] = props[category.name].favorite
}
else {
category['favorite'] = false
}
}
}
function sortByFavorites() {
for(var i = 0; i < items.menuModel.count; i++) {
if(items.menuModel.get(i)['favorite']) {
items.menuModel.move(i, 0, 1);
}
}
}
function launchMenuScreen() {
items.categoryReview.stop()
items.menuScreen.start()
}
function startCategory() {
items.categoryReview.start()
items.menuScreen.stop()
currentLevel = 0
items.bar.level = 0
initLevel()
}
function storeCategoriesLevels(index_) {
index = index_
currentLevel = 0
numberOfLevel = 0
initLevel()
}
function initLevel() {
items.bar.level = currentLevel + 1
items.categoryReview.score.currentSubLevel = 0
items.instructionsVisible = true
getCategoryLevels(index);
numberOfLevel = items.details.length;
items.categoryReview.leftZone.clear();
items.categoryReview.rightZone.clear();
items.categoryReview.start();
items.menuScreen.stop()
}
function nextLevel() {
if(numberOfLevel <= ++currentLevel) {
currentLevel = 0
}
items.categoryReview.score.currentSubLevel = 0
initLevel(index);
getCategoryLevels();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
initLevel(index);
getCategoryLevels();
}
// Checks if all the items are dragged and dropped in the correct or incorrect area.
function allPlaced() {
items.categoryReview.score.currentSubLevel = 0;
for(var i = 0 ; i < items.categoryReview.leftZone.count; ++i) {
for(var answer in answerTable) {
var droppedZoneItem = items.categoryReview.leftZone.get(i)
if(answer === droppedZoneItem.name &&
((droppedZoneItem.droppedZone === "right" && answerTable[answer])
|| (droppedZoneItem.droppedZone === "left" && !answerTable[answer])))
items.categoryReview.score.currentSubLevel ++
}
}
for(var i = 0 ; i < items.categoryReview.rightZone.count; ++i) {
for(var answer in answerTable) {
var droppedZoneItem = items.categoryReview.rightZone.get(i)
if(answer === droppedZoneItem.name &&
((droppedZoneItem.droppedZone === "right" && answerTable[answer])
|| (droppedZoneItem.droppedZone === "left" && !answerTable[answer])))
items.categoryReview.score.currentSubLevel ++
}
}
if(items.categoryReview.score.currentSubLevel === totalImages)
items.bonus.good("flower")
else
- items.bonus.bad("flower")
+ items.bonus.bad("flower", items.bonus.checkAnswer)
}
// Save properties to lessons
function getCategoryLevels() {
var randomGood = 0;
var randomBad = 0;
items.categoryReview.middleZone.clear()
/* If easy or medium mode is selected, store the details of levels of category of that respective index in items.details. */
if(items.mode !== "expert") {
items.details = lessons[index].map(function(ele) {
return { "instructions": ele.instructions, "image": ele.image,
"numberOfGood": ele.maxNumberOfGood, "numberofBad": ele.maxNumberOfBad,
"categoryImages": ele.levelImages ,"good": ele.good,
"bad": ele.bad ,"prefix": ele.prefix }
});
}
// If expert mode is selected, select a random level (selectedLevel) from a random category (selectedCategory)
else if(items.mode === "expert") {
var selectedCategory = Math.floor(Math.random() * expertCategories.length)
var selectedLevel = []
selectedLevel[0] = expertCategories[selectedCategory][Math.floor(Math.random() * expertCategories[selectedCategory].length)]
items.details = selectedLevel.map(function(ele) {
return { "instructions": ele.instructions, "image": ele.image,
"numberOfGood": ele.maxNumberOfGood, "numberofBad": ele.maxNumberOfBad,
"categoryImages": ele.levelImages ,"good": ele.good,
"bad": ele.bad, "prefix": ele.prefix }
});
}
var imagesPrefix = items.details[items.bar.level - 1].prefix
// Good set of images
var goodImages = items.details[items.bar.level - 1].good
var numberOfGood = Math.min(goodImages.length,items.details[items.bar.level-1].numberOfGood);
var goodZoneImages = goodImages.map(function(obj) {
obj = imagesPrefix + obj
return { "name": obj, "isRight": true }
});
goodZoneImages = goodZoneImages.splice(0, numberOfGood);
// Bad set of images
var badImages = items.details[items.bar.level - 1].bad
var badZoneImages = badImages.map(function(obj) {
obj = imagesPrefix + obj
return { "name": obj, "isRight": false }
});
var numberOfBad = Math.min(badImages.length,items.details[items.bar.level-1].numberofBad);
badZoneImages = badZoneImages.splice(0, numberOfBad);
// Concat both set of images(good and bad) in allImages and store in middleZone model
var allImages = goodZoneImages.concat(badZoneImages);
Core.shuffle(allImages);
for(var i = 0; i < allImages.length; i++) {
answerTable[allImages[i].name] = allImages[i].isRight
items.categoryReview.middleZone.append({"isRight": allImages[i].isRight,"name": allImages[i].name})
}
totalImages = allImages.length
items.categoryReview.score.numberOfSubLevels = totalImages
}
// get categories details from the complete dataset
function getCategoryModel(dataset) {
var categories = []
for (var c = 0; c < dataset.length; c++) {
categories.push({
'name': dataset[c].levels[0].name,
'image': dataset[c].levels[0].image,
'index': c
})
}
return categories
}
// get all the content (levels) from the category in dataset
function getAllLessons(dataset) {
var lessons = []
for(var c = 0; c < dataset.length; c++) {
lessons.push(dataset[c].levels[0].content)
if(dataset[c].allowExpertMode) {
expertCategories.push(dataset[c].levels[0].content)
}
}
return lessons
}
function setValues() {
items.categoryReview.leftAreaContainsDrag = false
items.categoryReview.rightAreaContainsDrag = false
}
function isDragInLeftArea(leftAreaRightBorderPos, elementRightPos) {
if(elementRightPos <= leftAreaRightBorderPos)
return true;
else
return false;
}
function isDragInRightArea(rightAreaLeftBorderPos, elementLeftPos) {
if((rightAreaLeftBorderPos <= elementLeftPos))
return true;
else
return false;
}
function dropControl(sourcePosition, destinationPosition, image, index) {
var destinationZone = destinationPosition === "left" ? items.categoryReview.leftZone : destinationPosition === "right" ? items.categoryReview.rightZone : items.categoryReview.middleZone
var sourceZone = sourcePosition === "left" ? items.categoryReview.leftZone : sourcePosition === "right" ? items.categoryReview.rightZone : items.categoryReview.middleZone
destinationZone.append({"name": image, "droppedZone": destinationPosition})
sourceZone.remove(index)
}
diff --git a/src/activities/chess/Chess.qml b/src/activities/chess/Chess.qml
index 42c8b72a8..2acdd7fdd 100644
--- a/src/activities/chess/Chess.qml
+++ b/src/activities/chess/Chess.qml
@@ -1,486 +1,552 @@
/* GCompris - chess.qml
*
* Copyright (C) 2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.5
import QtQuick.Controls.Styles 1.4
import GCompris 1.0
import "../../core"
import "."
import "chess.js" as Activity
ActivityBase {
id: activity
property bool acceptClick: true
property bool twoPlayers: false
+ property bool displayTakenPiecesButton: true
property int coordsOpacity: 1
+ property int movesCount: 0
// difficultyByLevel means that at level 1 computer is bad better at last level
property bool difficultyByLevel: true
property var fen: [
["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"],
["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"],
["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"],
["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"],
["initial state", "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 1 1"]
]
onStart: focus = true
onStop: {}
pageComponent: Image {
id: background
anchors.fill: parent
source: Activity.url + 'background-wood.svg'
signal start
signal stop
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property GCSfx audioEffects: activity.audioEffects
property alias background: background
property alias bar: bar
property alias bonus: bonus
property int barHeightAddon: ApplicationSettings.isBarHidden ? 1 : 3
property bool isPortrait: (background.height >= background.width)
property int cellSize: items.isPortrait ?
Math.min((background.width - numbers.childrenRect.width) / (8 + 2),
(background.height - controls.height - letters.childrenRect.height) / (8 + barHeightAddon)) :
Math.min((background.width - numbers.childrenRect.width) / (8 + 2), (background.height - letters.childrenRect.height) / (8.5 + barHeightAddon))
property var fen: activity.fen
property bool twoPlayer: activity.twoPlayers
property bool difficultyByLevel: activity.difficultyByLevel
property var positions
property var pieces: pieces
property var squares: squares
property var history
property var redo_stack
property alias redoTimer: redoTimer
property int from
property bool blackTurn
property bool gameOver
property string message
property bool isWarningMessage
property alias trigComputerMove: trigComputerMove
+ property alias whiteTakenPieceModel: whiteTakenPieces.takenPiecesModel
+ property alias blackTakenPieceModel: blackTakenPieces.takenPiecesModel
Behavior on cellSize { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } }
}
onStart: { Activity.start(items) }
onStop: { Activity.stop() }
Grid {
anchors {
top: parent.top
topMargin: items.isPortrait ? 0 : items.cellSize
leftMargin: 10 * ApplicationInfo.ratio
rightMargin: 10 * ApplicationInfo.ratio
}
columns: (items.isPortrait==true)?1:3
rows: (items.isPortrait==true)?2:1
width: (items.isPortrait==true)?undefined:background.width
anchors.horizontalCenter: parent.horizontalCenter
spacing: 10
horizontalItemAlignment: Grid.AlignHCenter
verticalItemAlignment: Grid.AlignVCenter
Column {
id: controls
anchors {
leftMargin: 10
rightMargin: 10
}
z: 20
width: items.isPortrait ?
parent.width :
Math.max(undo.width * 1.2,
Math.min(
(background.width * 0.9 - undo.width - chessboard.width),
(background.width - chessboard.width) / 2))
GCText {
color: items.isWarningMessage ? "red" : "white"
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
fontSize: smallSize
text: items.message
horizontalAlignment: Text.AlignHCenter
wrapMode: TextEdit.WordWrap
}
Grid {
spacing: 60 * ApplicationInfo.ratio
- columns: items.isPortrait ? 3 : 1
+ columns: items.isPortrait ? 4 : 1
anchors.horizontalCenter: parent.horizontalCenter
horizontalItemAlignment: Grid.AlignHCenter
verticalItemAlignment: Grid.AlignVCenter
Button {
id: undo
height: 30 * ApplicationInfo.ratio
width: height
text: "";
style: GCButtonStyle { theme: "noStyle" }
- onClicked: Activity.undo()
+ onClicked: {
+ Activity.undo()
+ if(whiteTakenPieces.pushedLast[whiteTakenPieces.pushedLast.length-1] == movesCount) {
+ whiteTakenPieces.pushedLast.pop()
+ whiteTakenPieces.takenPiecesModel.remove(whiteTakenPieces.takenPiecesModel.count-1)
+ }
+ if(!items.twoPlayer) {
+ movesCount--
+ }
+ if(blackTakenPieces.pushedLast[blackTakenPieces.pushedLast.length-1] == movesCount) {
+ blackTakenPieces.pushedLast.pop()
+ blackTakenPieces.takenPiecesModel.remove(blackTakenPieces.takenPiecesModel.count-1)
+ }
+ movesCount--
+ }
enabled: items.history.length > 0 ? 1 : 0
opacity: enabled
Image {
source: Activity.url + 'undo.svg'
height: parent.height
width: height
sourceSize.height: height
fillMode: Image.PreserveAspectFit
}
Behavior on opacity {
PropertyAnimation {
easing.type: Easing.InQuad
duration: 200
}
}
}
Button {
id: redo
height: undo.height
width: undo.height
text: "";
style: GCButtonStyle { theme: "noStyle" }
onClicked: {
if (!twoPlayers) {
acceptClick = false;
Activity.redo()
} else {
Activity.redo()
}
}
enabled: items.redo_stack.length > 0 && acceptClick ? 1 : 0
opacity: enabled
Image {
source: Activity.url + 'redo.svg'
height: parent.height
width: height
sourceSize.height: height
fillMode: Image.PreserveAspectFit
}
Behavior on opacity {
PropertyAnimation {
easing.type: Easing.InQuad
duration: 200
}
}
}
+ Button {
+ id: drawerButton
+ height: 30 * ApplicationInfo.ratio
+ width: height
+ text: "";
+ style: GCButtonStyle { theme: "light" }
+
+ onClicked: {
+ whiteTakenPieces.open = !whiteTakenPieces.open
+ blackTakenPieces.open = !blackTakenPieces.open
+ }
+
+ enabled: displayTakenPiecesButton
+ opacity: enabled
+ Image {
+ source: Activity.url + 'captured.svg'
+ height: parent.height
+ width: height
+ sourceSize.height: height
+ fillMode: Image.PreserveAspectFit
+ }
+ Behavior on opacity {
+ PropertyAnimation {
+ easing.type: Easing.InQuad
+ duration: 200
+ }
+ }
+ }
+
Button {
height: undo.height
width: undo.height
text: "";
style: GCButtonStyle { theme: "noStyle" }
enabled: items.twoPlayer
opacity: enabled
Image {
source: Activity.url + 'turn.svg'
height: parent.height
width: height
sourceSize.height: height
fillMode: Image.PreserveAspectFit
}
onClicked: chessboard.swap()
}
}
}
-
Rectangle {
id: boardBg
width: items.cellSize * 8.2
height: boardBg.width
z: 08
color: "#452501"
// The chessboard
GridView {
id: chessboard
cellWidth: items.cellSize
cellHeight: items.cellSize
width: items.cellSize * 8
height: chessboard.width
interactive: false
keyNavigationWraps: true
model: 64
layoutDirection: Qt.RightToLeft
delegate: square
rotation: 180
z: 10
anchors.centerIn: boardBg
Component {
id: square
Image {
source: index % 2 + (Math.floor(index / 8) % 2) == 1 ?
Activity.url + 'chess-white.svg' : Activity.url + 'chess-black.svg';
width: items.cellSize
height: items.cellSize
}
}
Behavior on rotation { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1400 } }
function swap() {
items.audioEffects.play('qrc:/gcompris/src/core/resource/sounds/flip.wav')
coordsOpacity = 0
timerSwap.start()
if(chessboard.rotation == 180)
chessboard.rotation = 0
else
chessboard.rotation = 180
}
}
Timer {
id: timerSwap
interval: 1500
running: false
repeat: false
onTriggered: coordsOpacity = 1
}
Grid {
id: letters
anchors.left: chessboard.left
anchors.top: chessboard.bottom
opacity: coordsOpacity
Behavior on opacity { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 500} }
Repeater {
id: lettersA
model: chessboard.rotation == 0 ? ["F", "G", "F", "E", "D", "C", "B", "A"] : ["A", "B", "C", "D", "E", "F", "G", "H"]
GCText {
x: items.cellSize * (index % 8) + (items.cellSize/2-width/2)
y: items.cellSize * Math.floor(index / 8)
text: modelData
color: "#CBAE7B"
}
}
}
Grid {
id: numbers
anchors.left: chessboard.right
anchors.top: chessboard.top
opacity: coordsOpacity
Behavior on opacity { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 500} }
Repeater {
model: chessboard.rotation == 0 ? ["1", "2", "3", "4", "5", "6", "7", "8"] : ["8", "7", "6", "5", "4", "3", "2", "1"]
GCText {
x: items.cellSize * Math.floor(index / 8) + width
y: items.cellSize * (index % 8) + (items.cellSize/2-height/2)
text: modelData
color: "#CBAE7B"
}
}
}
Rectangle {
id: boardBorder
width: items.cellSize * 10
height: boardBorder.width
anchors.centerIn: boardBg
z: -1
color: "#542D0F"
border.color: "#3A1F0A"
border.width: items.cellSize * 0.1
}
}
}
Repeater {
id: squares
model: items.positions
delegate: square
parent: chessboard
DropArea {
id: square
x: items.cellSize * (7 - pos % 8) + spacing / 2
y: items.cellSize * Math.floor(pos / 8) + spacing / 2
width: items.cellSize - spacing
height: square.width
z: 1
keys: acceptMove ? ['acceptMe'] : ['sorryNo']
property bool acceptMove : false
property int pos: modelData.pos
property int spacing: 6 * ApplicationInfo.ratio
Rectangle {
id: possibleMove
anchors.fill: parent
color: parent.containsDrag ? '#803ACAFF' : 'transparent'
border.width: parent.acceptMove ? 5 : 0
border.color: '#FF808080'
z: 1
}
}
function getSquareAt(pos) {
for(var i=0; i < squares.count; i++) {
if(squares.itemAt(i).pos === pos)
return squares.itemAt(i)
}
return(undefined)
}
}
Repeater {
id: pieces
model: items.positions
delegate: piece
parent: chessboard
Piece {
id: piece
sourceSize.width: items.cellSize
width: items.cellSize - spacing
height: piece.width
source: img ? Activity.url + img + '.svg' : ''
img: modelData.img
x: items.cellSize * (7 - pos % 8) + spacing / 2
y: items.cellSize * Math.floor(pos / 8) + spacing / 2
z: 1
pos: modelData.pos
newPos: modelData.pos
- rotation: - chessboard.rotation
+ rotation: -chessboard.rotation
property int spacing: 6 * ApplicationInfo.ratio
Drag.active: dragArea.drag.active
Drag.hotSpot.x: width / 2
Drag.hotSpot.y: height / 2
MouseArea {
id: dragArea
anchors.fill: parent
enabled: !items.gameOver
drag.target: parent
onPressed: {
piece.Drag.keys = ['acceptMe']
parent.z = 100
if(parent.isWhite == 1 && !items.blackTurn ||
parent.isWhite == 0 && items.blackTurn) {
items.from = parent.newPos
Activity.showPossibleMoves(items.from)
} else if(items.from != -1 && squares.getSquareAt(parent.newPos)['acceptMove']) {
Activity.moveTo(items.from, parent.newPos)
}
}
onReleased: {
// If no target or move not possible, we reset the position
if(!piece.Drag.target || (items.from != -1 && !Activity.moveTo(items.from, piece.Drag.target.pos))) {
var pos = parent.pos
// Force recalc of the old x,y position
parent.pos = -1
pieces.getPieceAt(pos).move(pos)
}
}
}
}
function moveTo(from, to) {
+ movesCount ++
var fromPiece = getPieceAt(from)
var toPiece = getPieceAt(to)
- if(toPiece.img !== '')
+ if(toPiece.img !== '') {
items.audioEffects.play('qrc:/gcompris/src/core/resource/sounds/smudge.wav')
+ if(toPiece.isWhite) {
+ whiteTakenPieces.takenPiecesModel.append(toPiece)
+ whiteTakenPieces.pushedLast.push(movesCount)
+ } else {
+ blackTakenPieces.takenPiecesModel.append(toPiece)
+ blackTakenPieces.pushedLast.push(movesCount)
+ }
+ }
else
items.audioEffects.play('qrc:/gcompris/src/core/resource/sounds/scroll.wav')
toPiece.hide(from)
fromPiece.move(to)
}
function promotion(to) {
var toPiece = getPieceAt(to)
toPiece.promotion()
}
function getPieceAt(pos) {
for(var i=0; i < pieces.count; i++) {
if(pieces.itemAt(i).newPos === pos)
return pieces.itemAt(i)
}
return(undefined)
}
}
Timer {
id: trigComputerMove
repeat: false
interval: 400
onTriggered: Activity.randomMove()
}
// Use to redo the computer move after the user move
Timer {
id: redoTimer
repeat: false
interval: 400
onTriggered: {
acceptClick = true;
Activity.moveByEngine(move)
}
property var move
function moveByEngine(engineMove) {
move = engineMove
redoTimer.start()
}
}
+ TakenPiecesList {
+ id: whiteTakenPieces
+ openWidth: items.cellSize * 0.8
+ edge: false
+ }
+ TakenPiecesList {
+ id: blackTakenPieces
+ openWidth: items.cellSize * 0.8
+ edge: true
+ }
+
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | (items.twoPlayer ? 0 : level) |
(items.twoPlayer && !items.gameOver ? 0 : reload) }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onReloadClicked: {
trigComputerMove.stop()
Activity.initLevel()
}
}
Bonus {
id: bonus
}
}
}
diff --git a/src/activities/chess/TakenPiecesList.qml b/src/activities/chess/TakenPiecesList.qml
new file mode 100644
index 000000000..ed98588d6
--- /dev/null
+++ b/src/activities/chess/TakenPiecesList.qml
@@ -0,0 +1,76 @@
+/* GCompris - TakenPiecesList.qml
+ *
+ * Copyright (C) 2018 Smit S. Patil <smit17av@gmail.com>
+ *
+ * Authors:
+ * Smit S. Patil <smit17av@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.6
+import "chess.js" as Activity
+
+Rectangle {
+
+ property alias takenPiecesModel: pieceList
+ property var pushedLast: []
+ property double openWidth
+ property bool open: false
+
+ // left = false, right = true
+ property bool edge
+
+ height: parent.height
+ width: open ? openWidth : 0
+ color: edge ? "#88EEEEEE" : "#88111111"
+
+ Behavior on width {
+ NumberAnimation { duration: 200 }
+ }
+
+ anchors {
+ left: edge ? undefined : parent.left
+ right: edge ? parent.right : undefined
+ }
+
+ Flow {
+ anchors.fill:parent
+ layoutDirection: edge ? Qt.RightToLeft : Qt.LeftToRight
+
+ Repeater {
+ model: ListModel { id:pieceList }
+ Piece {
+ id: piece
+ sourceSize.width: width
+ width: open ? piece.height : 0
+ height: parent.height / 18
+ source: img ? Activity.url + img + '.svg' : ''
+ img: model.img
+ newPos: model.pos
+
+ Behavior on width {
+ NumberAnimation { duration: 200 }
+ }
+ }
+ }
+ }
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ whiteTakenPieces.open = false
+ blackTakenPieces.open = false
+ }
+ }
+}
diff --git a/src/activities/chess/chess.js b/src/activities/chess/chess.js
index c88c3b073..efca60e03 100644
--- a/src/activities/chess/chess.js
+++ b/src/activities/chess/chess.js
@@ -1,346 +1,348 @@
/* GCompris - chess.js
*
* Copyright (C) 2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import "qrc:/gcompris/src/core/core.js" as Core
.import "engine.js" as Engine
var url = "qrc:/gcompris/src/activities/chess/resource/"
var currentLevel
var numberOfLevel
var items
var state
function start(items_) {
items = items_
currentLevel = 0
numberOfLevel = items.fen.length
initLevel()
}
function stop() {
}
function initLevel() {
items.bar.level = currentLevel + 1
state = Engine.p4_fen2state(items.fen[currentLevel][1])
items.from = -1
items.gameOver = false
items.redo_stack = []
refresh()
Engine.p4_prepare(state)
items.positions = 0 // Force a model reload
items.positions = simplifiedState(state['board'])
clearAcceptMove()
+ items.whiteTakenPieceModel.clear()
+ items.blackTakenPieceModel.clear()
}
function nextLevel() {
if(numberOfLevel <= ++currentLevel ) {
currentLevel = 0
}
initLevel();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
initLevel();
}
function simplifiedState(state) {
var newState = new Array()
for(var i = state.length - 1; i >= 0; --i) {
if(state[i] !== 16) {
var img = ""
switch(state[i]) {
case 2:
img = "wp"
break
case 3:
img = "bp"
break
case 4:
img = "wr"
break
case 5:
img = "br"
break
case 6:
img = "wn"
break
case 7:
img = "bn"
break
case 8:
img = "wb"
break
case 9:
img = "bb"
break
case 10:
img = "wk"
break
case 11:
img = "bk"
break
case 12:
img = "wq"
break
case 13:
img = "bq"
break
default:
break
}
newState.push(
{
'pos': engineToViewPos(i),
'img': img
})
}
}
return newState
}
function updateMessage(move) {
items.isWarningMessage = false
items.gameOver = false
items.message = items.blackTurn ? qsTr("Black's turn") : qsTr("White's turn")
if(!move)
return
if((move.flags & (Engine.P4_MOVE_FLAG_CHECK | Engine.P4_MOVE_FLAG_MATE))
== (Engine.P4_MOVE_FLAG_CHECK | Engine.P4_MOVE_FLAG_MATE)) {
items.message = items.blackTurn ? qsTr("White mates", "white wins") : qsTr("Black mates", "black wins")
items.gameOver = true
if(!items.twoPlayer)
if(state.to_play !== 0)
items.bonus.good('gnu')
else
items.bonus.good('tux')
else
items.bonus.good('flower')
} else if((move.flags & Engine.P4_MOVE_FLAG_MATE) == Engine.P4_MOVE_FLAG_MATE) {
items.message = qsTr("Drawn game")
items.gameOver = true
items.bonus.good('flower')
} else if((move.flags & Engine.P4_MOVE_FLAG_CHECK) == Engine.P4_MOVE_FLAG_CHECK) {
items.message = items.blackTurn ? qsTr("White checks", "black king is under attack") : qsTr("Black checks", "white king is under attack")
} else if(move.flags === Engine.P4_MOVE_ILLEGAL) {
items.isWarningMessage = true
items.message = qsTr("Invalid, your king may be in check")
}
}
function refresh(move) {
items.blackTurn = state.to_play // 0=w 1=b
items.history = state.history
updateMessage(move)
}
// Convert view position (QML) to the chess engine coordinate
//
// The engine manages coordinate into a 120 element array, which is conceptually
// a 10x12 board, with the 8x8 board placed at the centre, thus:
// + 0123456789
// 0 ##########
// 10 ##########
// 20 #RNBQKBNR#
// 30 #PPPPPPPP#
// 40 #........#
// 50 #........#
// 60 #........#
// 70 #........#
// 80 #pppppppp#
// 90 #rnbqkbnr#
//100 ##########
//110 ##########
//
// In QML each cell is in the regular range [0-63]
//
function viewPosToEngine(pos) {
return (Math.floor(pos / 8) + 2) * 10 + pos % 8 + 1
}
// Convert chess engine coordinate to view position (QML)
function engineToViewPos(pos) {
var newpos = pos - 21 - (Math.floor((pos - 20) / 10) * 2)
return newpos
}
// move is the result from the engine move
function visibleMove(move, from, to) {
items.pieces.moveTo(from, to)
// Castle move
if(move.flags & Engine.P4_MOVE_FLAG_CASTLE_KING)
items.pieces.moveTo(from + 3, to - 1)
else if(move.flags & Engine.P4_MOVE_FLAG_CASTLE_QUEEN)
items.pieces.moveTo(from - 4, to + 1)
else if(items.pieces.getPieceAt(to).img === 'wp' && to > 55)
items.pieces.promotion(to)
else if(items.pieces.getPieceAt(to).img === 'bp' && to < 8)
items.pieces.promotion(to)
}
function computerMove() {
var computer = state.findmove(3)
var move = state.move(computer[0], computer[1])
if(move.ok) {
visibleMove(move, engineToViewPos(computer[0]), engineToViewPos(computer[1]))
refresh(move)
}
return move
}
function moveTo(from, to) {
var move = state.move(viewPosToEngine(from), viewPosToEngine(to))
if(move.ok) {
visibleMove(move, from, to)
refresh(move)
clearAcceptMove()
items.redo_stack = []
if(!items.twoPlayer)
items.trigComputerMove.start()
items.from = -1;
} else {
// Probably a check makes the move is invalid
updateMessage(move)
}
return move.ok
}
function undo() {
var redo_stack = items.redo_stack
redo_stack.push(state.history[state.moveno - 1])
state.jump_to_moveno(state.moveno - 1)
// In computer mode, the white always starts, take care
// of undo after a mate which requires us to revert on
// a white play
if(!items.twoPlayer && state.to_play !== 0) {
redo_stack.push(state.history[state.moveno - 1])
state.jump_to_moveno(state.moveno - 1)
}
// without it, you can't move again the same piece
Engine.p4_prepare(state)
items.redo_stack = redo_stack
refresh()
items.positions = [] // Force a model reload
items.positions = simplifiedState(state['board'])
}
function moveByEngine(engineMove) {
if(!engineMove)
return
var move = state.move(engineMove[0], engineMove[1])
visibleMove(move, engineToViewPos(engineMove[0]), engineToViewPos(engineMove[1]))
refresh(move)
}
function redo() {
var redo_stack = items.redo_stack
moveByEngine(items.redo_stack.pop())
// In computer mode, the white always starts, take care
// of undo after a mate which requires us to revert on
// a white play
if(!items.twoPlayer && state.to_play !== 0) {
items.redoTimer.moveByEngine(items.redo_stack.pop())
}
// Force refresh
items.redo_stack = []
items.redo_stack = redo_stack
}
// Random move depending on the level
function randomMove() {
if(!items.difficultyByLevel) {
computerMove()
return
}
// Disable random move if the situation is too bad for the user
// This avoid having the computer playing bad against a user
// with too few pieces making the game last too long
var score = getScore()
if(score[0] / score[1] < 0.7) {
computerMove()
return
}
// At level 2 we let the computer play 20% of the time
// and 80% of the time we make a random move.
if(Math.random() < currentLevel / (numberOfLevel - 1)) {
computerMove()
return
}
// Get all possible moves
var moves = Engine.p4_parse(state, state.to_play, 0, 0)
moves = Core.shuffle(moves)
var move = state.move(moves[0][1], moves[0][2])
if(move.ok) {
visibleMove(move, engineToViewPos(moves[0][1]), engineToViewPos(moves[0][2]))
refresh(move)
} else {
// Bad move, should not happens
computerMove()
}
}
// Clear all accept move marker from the chessboard
function clearAcceptMove() {
for(var i=0; i < items.positions.length; ++i)
items.squares.getSquareAt(i)['acceptMove'] = false
}
// Highlight the possible moves for the piece at position 'from'
function showPossibleMoves(from) {
var result = Engine.p4_parse(state, state.to_play, 0, 0)
clearAcceptMove()
var fromEngine = viewPosToEngine(from)
for(var i=0; i < result.length; ++i) {
if(fromEngine === result[i][1]) {
var pos = engineToViewPos(result[i][2])
items.squares.getSquareAt(pos)['acceptMove'] = true
}
}
}
// Calculate the score for black and white
// Count the number of pieces with each piece having a given weight
// Piece pawn knight bishop rook queen
// Value 1 3 3 5 9
// @return [white, black]
function getScore() {
var lut = {2: 1, 4: 5, 6: 3, 8: 3, 12: 9}
var white = 0
var black = 0
for(var i=0; i < state['board'].length; ++i) {
var score = lut[state['board'][i] & 0xFE]
if(score)
if(state['board'][i] & 0x01)
black += score
else
white += score
}
return [white, black]
}
diff --git a/src/activities/chess/resource/captured.svg b/src/activities/chess/resource/captured.svg
new file mode 100644
index 000000000..e2de7c293
--- /dev/null
+++ b/src/activities/chess/resource/captured.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ width="42"
+ height="42"
+ id="svg3930"
+ sodipodi:docname="captured.svg"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+ <sodipodi:namedview
+ pagecolor="#a5a5a5"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ id="namedview10"
+ showgrid="true"
+ inkscape:zoom="4.9166667"
+ inkscape:cx="21.78496"
+ inkscape:cy="12.40678"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg3930">
+ <inkscape:grid
+ type="xygrid"
+ id="grid901" />
+ </sodipodi:namedview>
+ <defs
+ id="defs3932">
+ <linearGradient
+ id="linearGradient4295"
+ inkscape:collect="always">
+ <stop
+ id="stop4297"
+ offset="0"
+ style="stop-color:#f0f4f4;stop-opacity:1;" />
+ <stop
+ id="stop4299"
+ offset="1"
+ style="stop-color:#b4c8c8;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="28"
+ x2="36"
+ y1="4"
+ x1="36"
+ id="linearGradient4301"
+ xlink:href="#linearGradient4295"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4295-479"
+ id="linearGradient4301-645"
+ x1="36"
+ y1="4"
+ x2="36"
+ y2="28"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4295-479">
+ <stop
+ style="stop-color:#425a5a;stop-opacity:1;"
+ offset="0"
+ id="stop4703" />
+ <stop
+ style="stop-color:#161e1e;stop-opacity:1"
+ offset="1"
+ id="stop4705" />
+ </linearGradient>
+ </defs>
+ <metadata
+ id="metadata3935">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ <dc:date>2018</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <path
+ style="opacity:1;vector-effect:none;fill:#653611;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 6 1 C 3.23 1 1 3.23 1 6 L 1 36 C 1 38.77 3.23 41 6 41 L 21 41 L 21 1 L 6 1 z "
+ id="rect819-3" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:1;vector-effect:none;fill:#ebd0a5;fill-opacity:1;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 36,1 c 2.77,0 5,2.23 5,5 v 30 c 0,2.77 -2.23,5 -5,5 H 21 V 1 Z"
+ id="rect819-3-6" />
+ <g
+ id="g869"
+ transform="matrix(0.33665277,0,0,0.33665277,0.15448841,10.248513)">
+ <g
+ inkscape:label="Calque 2"
+ id="layer2" />
+ <g
+ style="fill:#3d4343;fill-opacity:1"
+ id="g4250">
+ <path
+ id="path4139-5"
+ d="M 25,27 22.023438,42.869141 10,47 c -2.0635153,2.272523 -2.0635153,7.727477 0,10 l 4.490234,4.640625 H 49.509766 L 54,57 c 2.063515,-2.272523 2.120155,-7.727477 0.05664,-10 H 54 L 41.988281,42.933594 39,27 Z"
+ style="fill:#3d4343;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4139"
+ d="m 16,60 h 32 l 3,-3 H 13 Z"
+ style="fill:#b4c8c8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4145"
+ d="m 12,49 c -1.885618,1.707047 -1.885618,5.292953 0,7 h 40 c 1.885618,-1.707047 1.885618,-5.292953 0,-7 z"
+ style="fill:#ccdada;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4139-3"
+ d="m 24,44 h 16 l 12,4 H 12 Z"
+ style="fill:#f0f4f4;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="path4171"
+ d="M 24,43 H 40 L 36,16 h -8 z"
+ style="fill:#ccdada;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <circle
+ r="13.38896"
+ cy="15.621192"
+ cx="32"
+ id="path4177-6"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#3d4343;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ <circle
+ r="12"
+ cy="16"
+ cx="32"
+ id="path4177"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4301);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ </g>
+ <g
+ id="layer2-3"
+ inkscape:label="Calque 2"
+ transform="matrix(0.33665277,0,0,0.33665277,20.154488,10.248513)">
+ <g
+ id="g4250-6"
+ style="fill:#7a8686;fill-opacity:1">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#7a8686;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 25,27 22.023438,42.869141 10,47 c -2.0635153,2.272523 -2.0635153,7.727477 0,10 l 4.490234,4.640625 H 49.509766 L 54,57 c 2.063515,-2.272523 2.120155,-7.727477 0.05664,-10 H 54 L 41.988281,42.933594 39,27 Z"
+ id="path4139-5-7" />
+ </g>
+ <path
+ style="fill:#161e1e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 16,60 h 31.999999 l 3,-3 H 13 Z"
+ id="path4139-53"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#283737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 12,49 c -1.885618,1.707047 -1.885618,5.292953 0,7 h 39.999999 c 1.885618,-1.707047 1.885618,-5.292953 0,-7 z"
+ id="path4145-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#425a5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 23.999999,44 h 16 l 12,4 H 12 Z"
+ id="path4139-3-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#283737;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 23.999999,43 h 16 l -4,-27 h -8 z"
+ id="path4171-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <circle
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#7a8686;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ id="path4177-6-9"
+ cx="32"
+ cy="15.621192"
+ r="13.38896" />
+ <circle
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4301-645);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ id="path4177-1"
+ cx="32"
+ cy="16"
+ r="12" />
+ </g>
+ <rect
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.02547884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect903"
+ width="1"
+ height="40"
+ x="20.5"
+ y="1" />
+</svg>
diff --git a/src/activities/chess_partyend/ChessPartyEnd.qml b/src/activities/chess_partyend/ChessPartyEnd.qml
index a85fcf9c4..7374d77bb 100644
--- a/src/activities/chess_partyend/ChessPartyEnd.qml
+++ b/src/activities/chess_partyend/ChessPartyEnd.qml
@@ -1,46 +1,47 @@
/* GCompris - chess_2players.qml
*
* Copyright (C) 2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "../../core"
import "../chess"
Chess {
twoPlayers: false
difficultyByLevel: false
+ displayTakenPiecesButton: false
fen: [
["", "4k3/8/8/8/8/8/8/K4QQ1 w - -"],
["", "1k6/8/8/8/8/8/8/K4RR1 w - -"],
["", "8/8/8/1B6/1R6/8/8/k3K3 w - -"],
["", "8/8/8/3N4/3N4/3B4/3B4/k3K3 w - -"],
["checkmate in 1", "8/8/8/8/8/6K1/4Q3/6k1 w - - 21 61"],
["mate in 1", "5k2/8/5K2/4Q3/5P2/8/8/8 w - - 3 61"],
["zugzwang", "8/8/p1p5/1p5p/1P5p/8/PPP2K1p/4R1rk w - - 0 1"],
["earlyish", "rnq1nrk1/pp3pbp/6p1/3p4/3P4/5N2/PP2BPPP/R1BQK2R w KQ -"],
["checkmate in 2", "4kb2/3r1p2/2R3p1/6B1/p6P/P3p1P1/P7/5K2 w - - 0 36"],
["leonid's position", "q2k2q1/2nqn2b/1n1P1n1b/2rnr2Q/1NQ1QN1Q/3Q3B/2RQR2B/Q2K2Q1 w - -"],
["sufficient material - opposing bishops", "8/6BK/7B/6b1/7B/8/B7/7k w - - 40 40"],
["checkmate in 1", "rnbqkr2/ppppbp1p/8/3NQ3/8/8/PPPP1nPP/R1B1KBNR w - -"],
["checkmate in 2", "6k1/p4p2/1p4p1/2p4p/4Pnq1/1PQ5/P1P2PPP/3R2K1 w - -"],
["checkmate in 5, sacrifice your queen", "5rk1/1p3p1p/6p1/q2P4/2n5/P6Q/KB2p3/2R5 w - -"]
]
}
diff --git a/src/activities/chronos/ActivityInfo.qml b/src/activities/chronos/ActivityInfo.qml
index 16f013d77..502ffd223 100644
--- a/src/activities/chronos/ActivityInfo.qml
+++ b/src/activities/chronos/ActivityInfo.qml
@@ -1,44 +1,44 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Pulkit Gupta <pulkitgenius@gmail.com>
*
* Authors:
* Pulkit Gupta <pulkitgenius@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "chronos/Chronos.qml"
difficulty: 1
icon: "chronos/chronos.svg"
author: "Pulkit Gupta &lt;pulkitgenius@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Chronos")
//: Help title
description: qsTr("Drag and Drop the items to organize the story")
// intro: "Slide the pictures into the order that tells the story"
//: Help goal
goal: qsTr("Sort the pictures into the order that tells the story")
//: Help prerequisite
prerequisite: qsTr("Tell a short story")
//: Help manual
manual: qsTr("Pick from the pictures on the left and put them on the red dots")
- credit: qsTr("Moon photo is copyright NASA. The space sounds come from Tuxpaint and Vegastrike which are released under the GPL license. The transportation images are copyright Franck Doucet. Dates of Transportation are based on those found in &lt;http://www.wikipedia.org&gt;.")
+ credit: qsTr("Moon photo is copyright NASA. The space sounds come from Tuxpaint and Vegastrike which are released under the GPL license. The transportation images are copyright Franck Doucet. Dates of Transportation are based on those found in &lt;https://www.wikipedia.org&gt;.")
section: "sciences history"
createdInVersion: 4000
}
diff --git a/src/activities/clickgame/clickgame.svg b/src/activities/clickgame/clickgame.svg
index de367acae..0e6e0fc0d 100644
--- a/src/activities/clickgame/clickgame.svg
+++ b/src/activities/clickgame/clickgame.svg
@@ -1,248 +1,236 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
id="svg49051"
sodipodi:version="0.32"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
version="1.0"
sodipodi:docname="clickgame.svg">
<defs
id="defs49053" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4.574158"
- inkscape:cx="64.72566"
+ inkscape:zoom="2.287079"
+ inkscape:cx="15.754899"
inkscape:cy="46.899131"
inkscape:document-units="px"
inkscape:current-layer="layer1"
height="100px"
width="100px"
- inkscape:window-width="1880"
- inkscape:window-height="1060"
- inkscape:window-x="-3"
- inkscape:window-y="-3"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
showgrid="false"
inkscape:snap-global="false"
inkscape:window-maximized="1" />
<metadata
id="metadata49056">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:date>2015</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Timothée Giet</dc:title>
</cc:Agent>
</dc:creator>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
<path
- style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8419742px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 63.726064,29.937747 C 58.6456,30.725204 51.403169,33.599916 46.564095,36.936301 41.725021,40.272687 41.507385,48.333091 36.695168,48.243086 31.88295,48.15308 32.761783,41.52088 29.520142,38.749571 26.278501,35.978261 20.057337,33.62974 15.792119,32.877138 9.1015754,32.227362 0.2722508,34.416024 3.3351054,41.569676 c 1.090021,2.536319 7.0255276,2.598526 10.2673906,5.733032 3.241863,3.134506 6.729106,4.791005 7.464818,10.454291 0.735713,5.663286 -1.167327,11.680527 -4.537971,16.27533 -3.633567,5.371758 -15.83409816,6.845353 -11.7301259,13.655012 1.0788342,3.162513 14.9003079,0.698728 20.5408799,-2.340519 5.640573,-3.039247 5.214643,-14.528996 11.715061,-14.161741 6.500419,0.367255 6.340635,8.280168 10.634312,11.766714 4.293676,3.486545 8.439228,6.410984 14.348533,7.138525 5.909304,0.727541 13.904546,-1.494467 19.236878,-4.234125 5.332332,-2.739658 9.240122,-5.601067 12.097784,-10.882752 2.857662,-5.281686 3.43355,-13.898204 3.024445,-19.525966 C 95.988004,49.819715 95.588543,46.500436 92.24729,41.975259 88.906038,37.450083 81.024841,32.6873 75.999685,30.917544 70.97453,29.147787 68.806529,29.150289 63.726064,29.937747 Z"
- id="path49949-6"
- sodipodi:nodetypes="zzzzcczzcczzzzzzzzzz"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.83985251px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 63.348297,30.104885 c -5.06765,0.785472 -12.29184,3.652941 -17.11872,6.980919 -4.82688,3.327978 -5.04397,11.368071 -9.84406,11.278293 -4.80009,-0.08978 -3.92347,-6.705267 -7.15694,-9.469592 -8.44257,-6.07794 -29.689337,-6.445347 -26.119057,2.812998 6.79406,5.034643 16.48631,8.227601 17.687527,16.146534 -0.69393,24.679891 -20.934907,19.336781 -16.227107,29.85492 1.07612,3.15454 12.58942,2.48317 20.489127,-3.30891 7.8997,-5.792084 5.2015,-13.518093 11.68554,-13.151766 6.48403,0.366332 6.32465,8.259305 10.60751,11.737064 4.28286,3.47776 8.41797,6.394832 14.31238,7.120532 5.89441,0.72571 14.40471,-1.88241 19.41805,-5.14202 11.79178,-7.666875 16.23625,-17.179251 15.31376,-27.806023 -1.26166,-12.190669 -9.73527,-20.009246 -20.80531,-26.075621 -5.01249,-1.765297 -7.17503,-1.762801 -12.2427,-0.977328 z"
+ id="path49949-6-0"
+ sodipodi:nodetypes="zzzcccczzzzsccz"
inkscape:connector-curvature="0" />
<path
- style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 79.158338,34.055655 C 78.879842,29.236503 71.709396,17.964698 68.642477,18.136811 c -1.375933,0.07722 -29.60136,11.88731 -28.886911,13.769007 0.532796,1.403263 3.778816,11.737218 0.154587,15.262304 -2.880564,2.801763 30.701761,-16.038381 39.248185,-13.112467 z"
- id="path4205-7"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 78.741687,34.212417 c -0.27779,-4.807009 -7.43017,-16.050411 -10.48936,-15.878731 -1.37246,0.07703 -29.52677,11.857355 -28.81412,13.734311 0.53145,1.399727 3.7693,11.707641 0.1542,15.223845 -2.87331,2.794703 30.6244,-15.997967 39.14928,-13.079425 z"
+ id="path4205-7-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssc" />
<path
- style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 76.839528,34.522852 C 76.587657,30.194408 70.801765,20.764582 68.028051,20.91917 66.78366,20.988523 41.25665,31.59606 41.902796,33.286154 c 0.481859,1.260377 3.277744,8.737077 0,11.903223 -2.605175,2.516475 27.207366,-13.294509 34.936732,-10.666525 z"
- id="path4205"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 76.428727,34.678436 c -0.25124,-4.317536 -6.02255,-13.723601 -8.78928,-13.569402 -1.24125,0.06918 -26.70394,10.649985 -26.05942,12.335821 0.48064,1.257201 3.26948,8.71506 0,11.873228 -2.59861,2.510134 27.13881,-13.261009 34.8487,-10.639647 z"
+ id="path4205-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssc" />
<path
- style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 60.366032,89.207426 c -2.899707,2.550811 -3.173054,7.727965 -9.372263,6.979297 L 30.853375,83.42458 c -4.074231,-3.62359 9.777502,-3.195918 12.164,-9.172788"
- id="path4173-3"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 59.996737,89.225207 c -2.8924,2.54439 -3.16506,7.7085 -9.34865,6.96172 L 30.558447,83.456941 c -4.06396,-3.614462 9.75286,-3.187865 12.13335,-9.149674"
+ id="path4173-3-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
- style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 58.897765,85.845839 c -2.247923,1.977463 -3.541939,7.845993 -8.347715,7.265604 L 34.936732,83.217855 c -3.158442,-2.809114 8.661866,-3.559681 10.511937,-8.193126"
- id="path4173"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748009px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 58.532167,85.872096 c -2.24225,1.97248 -3.53301,7.826231 -8.32668,7.247301 l -15.57397,-9.868663 c -3.15048,-2.802035 8.64004,-3.550712 10.48545,-8.172479"
+ id="path4173-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
- style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8419742px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 62.616968,32.218036 c -4.692925,0.72739 -11.382902,3.382818 -15.85285,6.464703 -4.469948,3.081885 -6.098936,11.384212 -10.544076,11.301072 -4.44514,-0.08314 -4.347322,-5.923844 -7.34169,-8.483757 C 25.883984,38.940141 22.279303,35.628403 18.339437,34.93321 14.399571,34.238017 8.827595,35.570503 7.002049,37.325151 5.176504,39.079799 5.111797,38.4779 6.118671,40.820748 c 1.006874,2.342848 7.203595,2.828696 10.198168,5.724101 2.994573,2.895405 6.215808,6.13909 6.8954,11.370379 0.679592,5.231289 -2.077851,13.35985 -5.191381,17.60416 -3.11353,4.24431 -10.295262,4.648993 -10.980049,7.379588 -0.684788,2.730595 -1.13743,1.884154 1.715449,3.234681 2.85288,1.350527 9.765439,-0.211344 14.975747,-3.018756 5.210308,-2.807412 8.243956,-14.705878 14.248521,-14.366637 6.004565,0.339241 5.856969,9.219303 9.823123,12.439894 3.966154,3.220591 7.795482,5.921953 13.254023,6.593997 5.458541,0.672044 12.843904,-1.380469 17.769484,-3.911145 4.92558,-2.530676 8.535283,-5.173816 11.174962,-10.052613 C 92.641797,68.9396 93.173756,60.980352 92.795857,55.781877 92.417958,50.583402 92.048968,47.517319 88.962587,43.337324 85.876206,39.157329 78.596189,34.757853 73.954354,33.123094 69.312519,31.488335 67.309893,31.490646 62.616968,32.218036 Z"
- id="path49949"
- sodipodi:nodetypes="zzzzzzzzzzzzzzzzzzzzzz"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.83985251px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 62.242007,32.379428 c -4.6811,0.725557 -11.35422,3.374294 -15.81291,6.448413 -4.45868,3.07412 -6.08357,11.355526 -10.5175,11.272595 -4.43395,-0.08293 -4.44454,-4.862752 -6.3489,-8.299997 -5.2926,-9.552756 -27.983677,-5.357537 -24.326147,-0.839977 5.9096,6.310455 16.967997,8.051947 16.725727,16.889024 -0.59996,21.88372 -16.295857,21.299488 -15.152727,26.858405 1.14313,5.558916 10.14924,2.864308 16.807857,-1.072702 6.65862,-3.937015 8.0608,-15.155971 14.05023,-14.817583 5.98944,0.338387 5.84221,9.19607 9.79837,12.408549 3.95616,3.212474 7.77584,5.907027 13.22063,6.577381 5.44478,0.670351 12.81154,-1.376992 17.72471,-3.901294 9.99939,-5.405231 17.03899,-16.000023 16.45957,-27.099778 -1.64677,-11.11853 -10.94454,-19.714254 -21.3201,-23.520259 -4.63014,-1.630639 -6.62771,-1.628334 -11.30881,-0.902777 z"
+ id="path49949-2"
+ sodipodi:nodetypes="zzzscsczzzzcccz"
inkscape:connector-curvature="0" />
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eaeef3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4222"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eaeef3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748009;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4222-6"
sodipodi:type="arc"
- sodipodi:cx="86.578522"
- sodipodi:cy="54.310028"
- sodipodi:rx="4.7922068"
- sodipodi:ry="7.8839526"
+ sodipodi:cx="86.143173"
+ sodipodi:cy="54.415756"
+ sodipodi:rx="4.7801313"
+ sodipodi:ry="7.8640857"
sodipodi:start="0.14344896"
sodipodi:end="0.14048923"
sodipodi:open="true"
- d="m 91.321507,55.437098 a 4.7922068,7.8839526 0 0 1 -5.424557,6.676737 4.7922068,7.8839526 0 0 1 -4.062422,-8.919328 4.7922068,7.8839526 0 0 1 5.418545,-6.689937 4.7922068,7.8839526 0 0 1 4.070441,8.909429" />
+ d="m 90.874207,55.539986 a 4.7801313,7.8640857 0 0 1 -5.410889,6.659912 4.7801313,7.8640857 0 0 1 -4.052185,-8.896852 4.7801313,7.8640857 0 0 1 5.404892,-6.673078 4.7801313,7.8640857 0 0 1 4.060184,8.886977" />
<g
- id="g4260"
- transform="translate(0,18)">
+ id="g4260-2"
+ transform="matrix(0.99748015,0,0,0.99748015,-0.21718,18.197219)">
<path
- sodipodi:nodetypes="cccccc"
- id="path54402"
- d="m 49.65685,13.293398 3.406083,3.032647 -3.530452,5.04186 -4.21996,1.454291 -1.140036,-6.44692 5.484365,-3.081878 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54402-7"
+ d="m 52.831299,11.909664 0.231634,4.416381 -6.542108,3.820918 2.372635,-5.969382 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
- sodipodi:nodetypes="cccccc"
- id="path54404"
- d="m 64.039825,8.8520949 2.665115,3.7007451 -4.542344,4.153499 -4.43522,0.501842 0.289154,-6.540554 6.023295,-1.8155321 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54404-0"
+ d="m 64.284013,7.2241726 2.9907,7.2007784 c -2.5237,0.293465 -7.104296,0.674768 -8.65198,1.155308 L 58.260718,9.7722697 Z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc"
- id="path54408"
- d="m 42.521663,68.662191 -1.971685,-2.39521 2.584894,-5.346975 4.067247,-1.838621 1.731828,6.313733 -6.412284,3.267073 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54408-9"
+ d="m 42.684455,67.522645 -1.483308,-1.255664 3.643043,-6.649313 c 0,0 1.393462,1.850702 3.995219,3.87615 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc"
- id="path54410"
- d="m 51.421497,72.327068 -3.672145,-2.240622 3.048656,-6.119912 4.067247,-1.838621 2.19559,5.386209 -5.639348,4.812946 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54410-3"
+ d="m 50.363347,72.08288 -2.613995,-1.996434 3.537033,-5.224555 c 0,0 2.685402,2.326361 4.623345,3.3429 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
- sodipodi:nodetypes="ccccsccccccccc"
- id="path50840"
- d="m 54.642546,19.043977 0.219483,3.926793 -5.195237,8.57014 3.296086,10.299103 c 0,0 -1.924109,4.009031 -2.721468,9.492381 -0.797359,5.48335 -1.474778,10.928897 -0.99502,10.77769 l 5.199252,2.638837 1.631096,-10.407208 -1.245633,-3.962216 4.089698,-7.63952 -2.957937,-13.583951 2.991125,-2.222447 -0.0017,-9.377463 -4.309752,1.487861 z"
- style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccsccccccccc"
- id="path54390"
- d="m 66.870433,15.60753 -1.122931,6.446994 -3.685022,9.242193 3.296086,10.299103 c 0,0 -1.924108,4.009031 -2.721467,9.49238 -0.797359,5.48335 -0.971373,17.313405 -0.491615,17.162198 l 5.534855,-1.393484 0.792087,-12.759394 1.439195,-4.130229 1.404871,-7.471508 -2.957937,-13.583951 1.480909,-2.8945 2.011928,-10.049516 -4.980959,-0.360286 z"
- style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cccccccccccc"
- id="path54392"
- d="m 79.341384,19.626574 -2.129742,5.438914 -3.349418,22.011208 0.611259,10.803143 c 0,0 3.445546,1.824857 4.494005,6.97218 l 4.157311,-4.719295 -4.937271,-5.138309 0.398061,-9.319655 2.243916,-12.743884 0.138496,-5.078674 4.193351,-4.337061 -5.819968,-3.888567 z"
+ sodipodi:nodetypes="cccccc"
+ id="path50840-6"
+ d="m 54.642546,19.043977 c -5.723723,13.28725 -6.281067,31.809085 -5.396156,43.066107 l 5.199252,2.638837 C 55.893887,47.684747 58.95521,33.655899 58.952291,17.556116 l -4.309752,1.487861 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
- sodipodi:nodetypes="cccccccccc"
- id="path54394"
- d="m 45.107658,25.016137 2.633146,6.278981 -3.530452,5.04186 2.073568,9.291023 c 0,0 -0.592916,6.361217 -1.641375,11.50854 l -4.828518,-6.063401 1.077831,-6.482417 -0.901466,-6.799454 -0.367099,-7.374444 5.484365,-5.400688 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54390-0"
+ d="m 66.870433,15.60753 c -0.611634,7.921003 -7.337926,35.515477 -4.724949,52.642868 l 5.534855,-0.127258 c 3.549198,-17.698408 0.715164,-34.893271 4.171053,-52.155324 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
- sodipodi:nodetypes="ccccccccccc"
- id="path54396"
- d="m 19.433996,19.471695 9.009612,5.102888 6.705452,17.810874 -3.296086,12.14725 c 0,0 -3.445546,3.168965 -6.507626,6.46814 l 1.283365,-9.017537 2.790172,-9.487668 -2.915123,-10.05567 -2.655521,-7.598875 -10.234213,-5.177128 5.819968,-0.192274 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54392-6"
+ d="m 81.873837,19.856797 c -8.24855,16.2556 -8.363773,33.390058 -2.906349,44.995222 L 82.43413,62.434954 C 75.529554,54.680095 76.854091,29.904202 84.700906,21.788469 Z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
- sodipodi:nodetypes="cccccc"
- id="path54412"
- d="m 10.146685,67.071099 -1.5079226,-2.395209 4.5945296,-2.873578 3.912659,-2.766145 1.886416,6.777495 -8.885682,1.257437 z"
+ sodipodi:nodetypes="ccccc"
+ id="path54394-2"
+ d="m 44.212301,25.178929 c 1.61736,9.439495 2.224593,20.16 0.186056,30.411086 L 40.3838,50.096387 C 42.089675,43.259508 39.806171,38.418943 39.460501,31.474975 Z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccccc"
- id="path54414"
- d="M 8.9872804,19.461816 8.0977067,23.093723 12.073887,25.039777 11.225708,19.637141 8.9872804,19.461816 Z"
+ id="path54396-6"
+ d="m 28.387569,24.19267 c 6.70678,10.719212 7.418831,15.393452 4.604951,27.735361 0,0 -3.038566,5.610849 -6.100646,8.910024 6.94787,-20.398454 4.209197,-27.930707 -4.649858,-41.174086 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
inkscape:connector-curvature="0" />
</g>
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#214f8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4224-5"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#214f8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748009;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4224-5-6"
sodipodi:type="arc"
- sodipodi:cx="88.433578"
- sodipodi:cy="54.068512"
- sodipodi:rx="2.4476323"
- sodipodi:ry="4.0965638"
+ sodipodi:cx="87.993561"
+ sodipodi:cy="54.174843"
+ sodipodi:rx="2.4414647"
+ sodipodi:ry="4.0862408"
sodipodi:start="0.14344896"
sodipodi:end="0.14048923"
sodipodi:open="true"
- d="m 90.856071,54.654146 a 2.4476323,4.0965638 0 0 1 -2.770607,3.469285 2.4476323,4.0965638 0 0 1 -2.074893,-4.634553 2.4476323,4.0965638 0 0 1 2.767537,-3.476143 2.4476323,4.0965638 0 0 1 2.078988,4.629409" />
+ d="m 90.409949,54.759002 a 2.4414647,4.0862408 0 0 1 -2.763626,3.460542 2.4414647,4.0862408 0 0 1 -2.069664,-4.622874 2.4414647,4.0862408 0 0 1 2.760563,-3.467384 2.4414647,4.0862408 0 0 1 2.073749,4.617743" />
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1f2a38;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4224"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1f2a38;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748009;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4224-1"
sodipodi:type="arc"
- sodipodi:cx="88.356285"
- sodipodi:cy="54.454979"
- sodipodi:rx="1.7777541"
- sodipodi:ry="2.7825716"
+ sodipodi:cx="87.916458"
+ sodipodi:cy="54.560333"
+ sodipodi:rx="1.7732744"
+ sodipodi:ry="2.7755599"
sodipodi:start="0.14344896"
sodipodi:end="0.14048923"
sodipodi:open="true"
- d="m 90.11578,54.852768 a 1.7777541,2.7825716 0 0 1 -2.012336,2.356496 1.7777541,2.7825716 0 0 1 -1.507028,-3.147999 1.7777541,2.7825716 0 0 1 2.010106,-2.361154 1.7777541,2.7825716 0 0 1 1.510002,3.144505" />
+ d="m 89.671519,54.95712 a 1.7732744,2.7755599 0 0 1 -2.007265,2.350558 1.7732744,2.7755599 0 0 1 -1.50323,-3.140066 1.7732744,2.7755599 0 0 1 2.00504,-2.355204 1.7732744,2.7755599 0 0 1 1.506198,3.13658" />
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4241"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748009;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4241-8"
sodipodi:type="arc"
- sodipodi:cx="87.096687"
- sodipodi:cy="55.946457"
- sodipodi:rx="1.2366985"
- sodipodi:ry="1.3912858"
+ sodipodi:cx="86.660034"
+ sodipodi:cy="56.048058"
+ sodipodi:rx="1.2335821"
+ sodipodi:ry="1.38778"
sodipodi:start="0.14344896"
sodipodi:end="0.14048923"
sodipodi:open="true"
- d="m 88.320683,56.145352 a 1.2366985,1.3912858 0 0 1 -1.399885,1.178247 1.2366985,1.3912858 0 0 1 -1.048367,-1.573999 1.2366985,1.3912858 0 0 1 1.398334,-1.180577 1.2366985,1.3912858 0 0 1 1.050436,1.572252" />
+ d="m 87.880946,56.246451 a 1.2335821,1.38778 0 0 1 -1.396358,1.175279 1.2335821,1.38778 0 0 1 -1.045725,-1.570033 1.2335821,1.38778 0 0 1 1.39481,-1.177602 1.2335821,1.38778 0 0 1 1.04779,1.56829" />
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4241-3"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748009;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4241-3-7"
sodipodi:type="arc"
- sodipodi:cx="86.901237"
- sodipodi:cy="59.409981"
- sodipodi:rx="0.58084011"
- sodipodi:ry="0.73542732"
+ sodipodi:cx="86.465088"
+ sodipodi:cy="59.502853"
+ sodipodi:rx="0.5793764"
+ sodipodi:ry="0.73357415"
sodipodi:start="0.14344896"
sodipodi:end="0.14048923"
sodipodi:open="true"
- d="m 87.476112,59.515116 a 0.58084011,0.73542732 0 0 1 -0.657485,0.622816 0.58084011,0.73542732 0 0 1 -0.492386,-0.832009 0.58084011,0.73542732 0 0 1 0.656756,-0.624047 0.58084011,0.73542732 0 0 1 0.493358,0.831085" />
+ d="m 87.038513,59.607723 a 0.5793764,0.73357415 0 0 1 -0.655827,0.621247 0.5793764,0.73357415 0 0 1 -0.491146,-0.829912 0.5793764,0.73357415 0 0 1 0.655101,-0.622475 0.5793764,0.73357415 0 0 1 0.492115,0.828991" />
</g>
</svg>
diff --git a/src/activities/color_mix/ActivityInfo.qml b/src/activities/color_mix/ActivityInfo.qml
index 5d72b3d96..c53b6084c 100644
--- a/src/activities/color_mix/ActivityInfo.qml
+++ b/src/activities/color_mix/ActivityInfo.qml
@@ -1,44 +1,44 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Stephane Mankowski <stephane@mankowski.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "color_mix/ColorMix.qml"
difficulty: 4
icon: "color_mix/color_mix.svg"
author: "Stephane Mankowski &lt;stephane@mankowski.fr&gt;"
demo: true
//: Activity title
title: qsTr("Mixing color of paint")
//: Help title
description: qsTr("Discover paint color mixing.")
// intro: "Match the colour by moving the sliders on the tubes of paint"
//: Help goal
goal: qsTr("Mix the primary colors to match to the given color")
//: Help prerequisite
prerequisite: ""
//: Help manual
manual: qsTr("
The activity deals with mixing primary colors of paint (subtractive mixing).
In case of paints the inks absorb different colors of light falling on it, subtracting it from what you see. The more ink you add, the more light is absorbed, and the darker the combined color gets. We can mix just three primary colors to make many new colors. The primary colors for paint/ink are cyan (a special shade of blue), magenta (a special shade of pink), and yellow.
")
- credit: qsTr("Images from http://openclipart.org")
+ credit: qsTr("Images from https://openclipart.org")
section: "sciences experiment color"
createdInVersion: 0
}
diff --git a/src/activities/color_mix/ColorButton.qml b/src/activities/color_mix/ColorButton.qml
index b0254f01a..81bd9bf95 100644
--- a/src/activities/color_mix/ColorButton.qml
+++ b/src/activities/color_mix/ColorButton.qml
@@ -1,78 +1,80 @@
/* GCompris - ColorButton.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "../../core"
Item {
id: button
height: parent.height / 4
width: height
z: 3
property alias source: buttonImage.source
signal clicked
Image {
id: buttonImage
anchors.centerIn: parent
sourceSize.width: parent.width
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
MouseArea {
id: mouseArea
anchors.centerIn: parent
- height: 3 * parent.height
- width: 3 * parent.width
+ height: 2.3 * parent.height
+ width: 2.3 * parent.width
hoverEnabled: true
+
+ onClicked: button.clicked()
}
states: [
State {
name: "notclicked"
PropertyChanges {
target: button
scale: 1.0
}
},
State {
name: "clicked"
when: mouseArea.pressed
PropertyChanges {
target: button
scale: 0.9
}
},
State {
name: "hover"
when: mouseArea.containsMouse
PropertyChanges {
target: button
- scale: 1.2
+ scale: 1.1
}
}
]
Behavior on scale { NumberAnimation { duration: 70 } }
}
diff --git a/src/activities/color_mix/ColorChooser.qml b/src/activities/color_mix/ColorChooser.qml
index 5583f2bb7..2710f7840 100644
--- a/src/activities/color_mix/ColorChooser.qml
+++ b/src/activities/color_mix/ColorChooser.qml
@@ -1,104 +1,81 @@
/* GCompris - ColorChooser.qml
*
* Copyright (C) 2014 Stephane Mankowski <stephane@mankowski.fr>
*
* Authors:
* Matilda Bernard <serah4291@gmail.com> (GTK+ version)
* Stephane Mankowski <stephane@mankowski.fr> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "colormix.js" as Activity
import "."
Image {
id: chooser
z: 1
property int maxSteps: 10
property int currentStep: 0
property string brushHue
Image {
id: intensityScreen
source: activity.modeRGB ? Activity.url + "flashlight2" + brushHue + ".svg" : "qrc:/gcompris/src/core/resource/empty.svg"
sourceSize.height: parent.sourceSize.height
sourceSize.width: parent.sourceSize.width
z: 2
opacity: currentStep / maxSteps
visible: activity.modeRGB
}
Image {
id: intensityBrush
source: Activity.url + (activity.modeRGB ?
"light" + brushHue + ".svg" : "brush" + brushHue + ".svg")
sourceSize.height: parent.sourceSize.height * 0.25 + currentStep / maxSteps * 15
z: 2
anchors {
left: parent.right
leftMargin: activity.modeRGB ? -20 * ApplicationInfo.ratio : 0
verticalCenter: parent.verticalCenter
}
opacity: activity.modeRGB ? currentStep / maxSteps * 2 : 1
visible: currentStep > 0
fillMode: Image.PreserveAspectFit
}
ColorButton {
source: Activity.url + "plus.svg"
anchors {
verticalCenter: parent.verticalCenter
right: parent.right
rightMargin: parent.width * 0.25
}
+ onClicked: currentStep = Math.min(currentStep+1, maxSteps)
}
ColorButton {
source: Activity.url + "minus.svg"
anchors {
verticalCenter: parent.verticalCenter
left: parent.left
- leftMargin: parent.width * 0.5
+ leftMargin: parent.width * 0.4
}
+ onClicked: currentStep = Math.max(currentStep-1, 0)
}
-
- MultiPointTouchArea {
- anchors.fill: parent
- touchPoints: [ TouchPoint { id: point1 } ]
- z: 4
- property real startX
- property int initialStep: 0
-
- onPressed: {
- startX = point1.x
- if(startX > parent.width / 2)
- currentStep = Math.max(currentStep + 1, 0)
- else
- currentStep = Math.max(currentStep - 1, 0)
- initialStep = currentStep
- }
-
- onTouchUpdated: {
- currentStep = initialStep + (point1.x - startX) / (20 * ApplicationInfo.ratio)
- currentStep = Math.min(currentStep, maxSteps)
- currentStep = Math.max(currentStep, 0)
- activity.audioEffects.play('qrc:/gcompris/src/activities/redraw/resource/brush.wav')
- }
- }
-
}
diff --git a/src/activities/color_mix_light/ActivityInfo.qml b/src/activities/color_mix_light/ActivityInfo.qml
index 9cbd18b16..b313af1d9 100644
--- a/src/activities/color_mix_light/ActivityInfo.qml
+++ b/src/activities/color_mix_light/ActivityInfo.qml
@@ -1,43 +1,43 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Stephane Mankowski <stephane@mankowski.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "color_mix_light/ColorMixLight.qml"
difficulty: 4
icon: "color_mix_light/color_mix_light.svg"
author: "Stephane Mankowski &lt;stephane@mankowski.fr&gt;"
demo: true
//: Activity title
title: qsTr("Mixing colors of light")
//: Help title
description: qsTr("Discover light color mixing.")
// intro: "Match the colour by moving the sliders on the torches"
//: Help goal
goal: qsTr("Mix the primary colors to match to the given color.")
//: Help prerequisite
prerequisite: ""
//: Help manual
manual: qsTr("
The activity deals with mixing primary colors of light (additive mixing).
In case of light it is just the opposite of mixing color with paints! The more light you add the lighter the resultant color will get. Primary colors of light are red, green and blue.")
- credit: qsTr("Images from http://openclipart.org")
+ credit: qsTr("Images from https://openclipart.org")
section: "sciences experiment color"
createdInVersion: 0
}
diff --git a/src/activities/colors/resource/README b/src/activities/colors/resource/README
index 9d53b7d62..7d2933c23 100644
--- a/src/activities/colors/resource/README
+++ b/src/activities/colors/resource/README
@@ -1,16 +1,16 @@
-Copyright: 2000, 2008 Bruno Coudoin and others
+Copyright: 2019 Timothée Giet
License: GPLv3
Files:
background.svg
black_duck.svg
blue_duck.svg
brown_duck.svg
checkError.svg
green_duck.svg
grey_duck.svg
orange_duck.svg
pink_duck.svg
purple_duck.svg
red_duck.svg
white_duck.svg
yellow_duck.svg
diff --git a/src/activities/colors/resource/background.svg b/src/activities/colors/resource/background.svg
index 4a2606740..b61dcb7ef 100644
--- a/src/activities/colors/resource/background.svg
+++ b/src/activities/colors/resource/background.svg
@@ -1,1340 +1,333 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="800"
height="520"
- id="svg6117"
+ viewBox="0 0 211.66666 137.58334"
version="1.1"
- inkscape:version="0.91 r13725"
+ id="svg1014"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="background.svg">
<defs
- id="defs6119" />
+ id="defs1008">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient1007">
+ <stop
+ style="stop-color:#5faadd;stop-opacity:1"
+ offset="0"
+ id="stop1003" />
+ <stop
+ style="stop-color:#2a7bc8;stop-opacity:0.88627452"
+ offset="1"
+ id="stop1005" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1007"
+ id="linearGradient1009"
+ x1="153.4127"
+ y1="159.78731"
+ x2="153.4127"
+ y2="298.23294"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4"
- inkscape:cx="398.21429"
- inkscape:cy="195.18501"
- inkscape:document-units="px"
- inkscape:current-layer="layer1-7"
+ inkscape:zoom="0.98994949"
+ inkscape:cx="454.79145"
+ inkscape:cy="215.94933"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
showgrid="false"
- inkscape:window-width="1680"
- inkscape:window-height="973"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- borderlayer="true" />
+ inkscape:window-y="0"
+ inkscape:window-maximized="1" />
<metadata
- id="metadata6122">
+ id="metadata1011">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
+ inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-532.36218)">
- <g
- id="layer1-7"
- inkscape:label="Layer 1"
- transform="matrix(0.33333553,0,0,0.29266325,1.7975882,531.48653)">
- <path
- sodipodi:nodetypes="ccccc"
- id="path3287"
- d="m 0,0 2400,0 0,1800 L 0,1800 0,0 z"
- style="fill:#70df13;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="csssssssssssscccccc"
- id="path3339"
- d="m 52,476 c 13.185848,-21.09802 40.533495,-26.56005 72,-36 30.06878,-9.02063 75.86955,0 108,0 42.41895,0 87.61414,8 132,8 86.05111,0 154.92174,-32.19605 244,-16 42.7512,7.77295 111.07764,-15.50776 156,-20 31.02563,-3.10256 62.60423,9.98127 96,20 53.38789,16.01637 101.60627,23.84251 152,44 40.9536,16.38143 83.8294,19.58294 128,24 93.9929,9.39929 202.2333,-36.0622 292,-60 99.3455,-26.49213 204.7992,-44 308,-44 91.9505,0 210.1994,176 301,176 70.9308,0 81.7304,-70.29297 148,-55 26.9023,6.20821 126.8596,10.37191 155,16 301.3717,12.49573 85.7674,-108.00416 163.5492,62.31371 L 2500.804,1864.069 -28,1892 -68,596 52,476 z"
- style="fill:#5ad216;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cssssssssssccccc"
- style="fill:#45d120;fill-opacity:1;stroke:none"
- d="m 386,1022 c 13.18585,-21.098 40.53349,-26.5601 72,-36 30.06878,-9.0206 75.86955,0 108,0 42.41895,0 87.61414,8 132,8 86.05111,0 154.92174,-32.19605 244,-16 42.7512,7.7729 111.0776,-15.5078 156,-20 31.0256,-3.10256 62.6042,9.9813 96,20 53.3879,16.0164 101.6063,23.8425 152,44 40.9536,16.3814 83.8294,19.5829 128,24 93.9929,9.3993 202.2333,-36.0622 292,-60 99.3455,-26.49213 204.7992,-44 308,-44 91.9505,0 177.1994,24 268,24 L 2454.2843,1831.6081 -32.793939,1856.1766 -79.490332,1164.3431 386,1022 z"
- id="path3341"
- inkscape:connector-curvature="0" />
- <path
- inkscape:transform-center-y="-8.4852814"
- inkscape:transform-center-x="-8.4852814"
- sodipodi:nodetypes="cccccc"
- id="path3358"
- d="m 298.9974,165.16662 c 2.82628,3.63034 8.10774,-1.49071 10.26194,-3.66972 11.6347,-4.54176 5.11482,-17.26475 -3.42951,-20.87471 -2.78027,-1.00538 -5.51518,-2.1287 -8.28658,-3.13909 -3.22214,3.03018 -1.73471,4.84012 -7.07191,7.3802 -0.0522,3.71593 6.54387,16.80828 8.52606,20.30332 z"
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#29b2bc;fill-opacity:1;stroke:none"
- d="m 144.75,-94.40625 c -0.0251,0.20851 0.1776,-0.12984 0,0 z m 0.21875,10.34375 C 81.932641,-75.1268 11.702188,-75.8692 -40.4375,-33.84375 -67.07591,-1.0087621 -89.612787,-37.290654 -87.917303,0.25009553 -77.542673,132.46081 -33.209412,288.71945 -44.65625,395.59375 c -11.446838,106.8743 -14.464166,165.04112 -15.25,240.5625 -0.785835,75.52138 4.089399,149.11149 0.53125,211.78125 -3.558148,62.66976 -58.21909,169.3901 -63.75,223.8437 -0.86194,44.8617 30.06325,88.4286 74.393914,98.8568 64.306421,18.3374 129.301696,-8.1325 192.317076,-19.5678 68.8226,-14.8834 141.92655,104.4727 206.45119,136.5555 91.70219,40.6858 317.45184,44.8539 385.08792,61.4683 67.63608,16.6144 1187.4151,154.3381 1290.9336,-21.1396 16.7127,-280.1705 -30.6951,-777.31032 -139.3053,-918.43131 C 1778.1432,268.4021 663.71177,330.74905 517.89956,322.40831 372.08735,314.06757 501.89172,655.54048 403.90625,781.4375 311.2555,900.48019 115.21122,744.72735 68,614.3125 21.20523,485.04803 67.751255,388.79564 74.62801,340.86544 82.409616,286.62854 36.932803,180.13839 54.1875,125.0625 79.574185,79.700979 137.47711,69.547902 185.07015,74.209401 287.23821,74.254161 402.7443,59.946266 491.44137,66.397781 693.74441,15.666539 890.10302,62.194455 1083.3933,40.326673 c 214.1483,-40.54473677 300.0761,45.692235 459.6752,-8.19839 181.4615,-88.624555 -128.373,-115.257335 -282.2034,-140.057433 -133.2012,-4.21666 -258.5673,13.3502 -391.5303,4.19143 -99.74212,-9.72612 -192.31187,1.67179 -292.39209,11.4906 -117.92929,2.00362 -211.43341,29.05472 -328.84896,20.30962 -34.25739,-4.83942 -68.32747,-12.82315 -103.125,-12.125 z"
- id="path3289"
- sodipodi:nodetypes="ccccczzzcccczczzzzzcccccccccc"
- inkscape:connector-curvature="0" />
- <g
- id="g3203"
- transform="translate(-965.28539,35.30369)"
- style="fill:#4b8a31;fill-opacity:1;stroke:#4c7144;stroke-opacity:1">
- <path
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- sodipodi:ry="35"
- sodipodi:rx="35"
- sodipodi:cy="875"
- sodipodi:cx="975"
- id="path3205"
- style="fill:#4b8a31;fill-opacity:1;stroke:#4c7144;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc"
- transform="translate(265.482,378.74517)"
- inkscape:export-filename="/home/qubodup/bush.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- </g>
- <path
- sodipodi:nodetypes="zccccccccz"
- id="path3285"
- d="M 7.625,583.1875 C -96.830882,289.23811 -115.78561,735.84738 -91.5,866.09375 c -4.118648,87.55717 77.425801,329.84515 234.22624,257.54365 140.41941,17.8772 99.43761,100.8769 228.29584,148.673 124.5753,30.0505 146.32347,30.3754 406.57532,49.1026 462.0519,59.0512 1129.7053,107.4342 1214.5651,-3.0975 38.1318,-4.1678 -18.0215,-745.40893 -149.1743,-888.69317 C 1711.8354,286.33809 621.58758,337.70912 541.09909,367.8604 390.43834,428.19839 572.98152,745.95462 382.375,868.6875 370.15817,867.60794 114.19818,883.09518 7.625,583.1875 z"
- style="fill:#004aaf;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- sodipodi:ry="35"
- sodipodi:rx="35"
- sodipodi:cy="875"
- sodipodi:cx="975"
- id="path3234"
- style="fill:#20af00;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc"
- transform="translate(1159.6197,-305.7684)" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- transform="translate(1205.6197,-345.7684)"
- sodipodi:type="arc"
- style="fill:#36c43c;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3232"
- sodipodi:cx="975"
- sodipodi:cy="875"
- sodipodi:rx="35"
- sodipodi:ry="35"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- sodipodi:ry="35"
- sodipodi:rx="35"
- sodipodi:cy="875"
- sodipodi:cx="975"
- id="path3226"
- style="fill:#1e923e;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc"
- transform="translate(1135.6197,-247.7684)" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccc"
- id="path3224"
- d="m 2154.1377,613.73643 -5,65 c 5,5 25,5 30,0 l -5,-65 -20,0 z"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- transform="translate(1344.1377,-231.51357)"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- d="m 860,800 a 40,80 0 0 1 -40,80 40,80 0 0 1 -40,-80 40,80 0 0 1 40,-80 40,80 0 0 1 40,80 z"
- sodipodi:ry="80"
- sodipodi:rx="40"
- sodipodi:cy="800"
- sodipodi:cx="820"
- id="path3222"
- style="fill:#05a230;fill-opacity:1;stroke:#084214;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <g
- id="g3291"
- transform="translate(-587.28539,424.30369)">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccc"
- id="path3293"
- d="m 810,845.25 -5,65 c 5,5 25,5 30,0 l -5,-65 -20,0 z"
- style="fill:#856241;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- d="m 860,800 a 40,80 0 0 1 -40,80 40,80 0 0 1 -40,-80 40,80 0 0 1 40,-80 40,80 0 0 1 40,80 z"
- sodipodi:ry="80"
- sodipodi:rx="40"
- sodipodi:cy="800"
- sodipodi:cx="820"
- id="path3295"
- style="fill:#5ad121;fill-opacity:1;stroke:#084214;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- </g>
- <g
- id="g3297"
- transform="translate(1434.4256,-524.64829)">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccc"
- id="path3299"
- d="m 810,845.25 -5,65 c 5,5 25,5 30,0 l -5,-65 -20,0 z"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- d="m 860,800 a 40,80 0 0 1 -40,80 40,80 0 0 1 -40,-80 40,80 0 0 1 40,-80 40,80 0 0 1 40,80 z"
- sodipodi:ry="80"
- sodipodi:rx="40"
- sodipodi:cy="800"
- sodipodi:cx="820"
- id="path3301"
- style="fill:#38c15e;fill-opacity:1;stroke:#084214;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- </g>
- <g
- id="g3303"
- transform="translate(-542,-746)">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccc"
- id="path3305"
- d="m 810,845.25 -5,65 c 5,5 25,5 30,0 l -5,-65 -20,0 z"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- d="m 860,800 a 40,80 0 0 1 -40,80 40,80 0 0 1 -40,-80 40,80 0 0 1 40,-80 40,80 0 0 1 40,80 z"
- sodipodi:ry="80"
- sodipodi:rx="40"
- sodipodi:cy="800"
- sodipodi:cx="820"
- id="path3307"
- style="fill:#3da205;fill-opacity:1;stroke:#084214;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- </g>
- <g
- id="g3311"
- transform="translate(-101.518,-626.25483)">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- sodipodi:ry="35"
- sodipodi:rx="35"
- sodipodi:cy="875"
- sodipodi:cx="975"
- id="path3313"
- style="fill:#20af00;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc"
- transform="translate(-8,-36)" />
- <path
- transform="translate(4,-16)"
- sodipodi:type="arc"
- style="fill:#20af00;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3396"
- sodipodi:cx="975"
- sodipodi:cy="875"
- sodipodi:rx="35"
- sodipodi:ry="35"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- inkscape:export-filename="/home/qubodup/bush.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- transform="translate(-34,10)"
- sodipodi:type="arc"
- style="fill:#00af08;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3315"
- sodipodi:cx="975"
- sodipodi:cy="875"
- sodipodi:rx="35"
- sodipodi:ry="35"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z" />
- <path
- transform="translate(33,17)"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- sodipodi:ry="35"
- sodipodi:rx="35"
- sodipodi:cy="875"
- sodipodi:cx="975"
- id="path3317"
- style="fill:#00af30;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- </g>
- <path
- sodipodi:nodetypes="cssssssssssssccccc"
- id="path3347"
- d="m -8,1552 c 84.759276,-21.1898 67.334743,-2.6661 144,28 65.93829,26.3753 117.2566,-24.6283 164,-48 66.75195,-33.376 137.36906,72 212,72 72.08927,0 99.84219,-12.756 192,4 70.78934,12.8708 132.63773,-61.2806 196,-44 69.97352,19.0837 152.6493,3.0366 216,-20 21.8513,-7.9459 87.0146,6.635 116,4 77.3748,-7.0341 80.0708,85.7385 184,28 82.5283,-45.8491 254.2535,-30.0845 356,-64 45.4989,-15.1663 71.2035,-4.2389 112,8 38.3556,11.5067 82.8555,-12.3433 124,0 34.9818,10.4945 68.0254,-19.2178 92,-36 34.3897,-24.0728 158.5891,62.2525 200,80 163.2074,52.2566 110.8258,58.2831 179.0418,98.0059 L 2415.2327,1865.0161 -44.555776,1846.6659 -8,1552 z"
- style="fill:#2ed216;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccsccccccccccc"
- id="path3319"
- d="m 2412.2812,629.21875 c -54.04,112.22438 -52.174,172.4783 -53.625,233.09375 6.992,96.41076 -20.5444,187.7997 -17.8437,281.6563 2.3676,82.279 26.9808,167.4502 9.8125,247.0312 -14.1277,133.135 -82.0097,288.7525 -224.9375,322.0938 -420.3085,57.1479 -845.5461,22.4708 -1267.21875,3.5624 -165.10292,-17.4065 -333.15828,-14.7871 -494.5625,27 -96.74244,19.401 -231.07174,35.0418 -289.1875,-65.0624 -74.39945777,-153.6037 33.1565,-318.9694 3.78125,-478.625 -1.025756,-10.8501 -3.065742,-21.9144 -6,-32.9688 -24.07962,5.3832 -48.287817,9.7383 -72.5,9.9062 L 0,1800 l 2400,0 c 42.0876,-249.3791 40.2499,-983.97286 12.2812,-1170.78125 z"
- style="fill:#5e3813;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- id="rect3328"
- d="m -135.75,-129 0,2053.4375 2715.2232,0 0,-2053.4375 -2715.2232,0 z M -0.2850908,0 2394.6746,0 l 0,1800 -2394.9596908,0 0,-1800 z"
- style="fill:#ffffff;fill-opacity:1;stroke:none"
- inkscape:connector-curvature="0" />
- <g
- transform="translate(-1314,61)"
- id="g3465">
- <path
- sodipodi:nodetypes="cccc"
- style="fill:#ffffff;fill-opacity:1;stroke:#cecece;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1631.5,881 c 15.5173,-2 -81.992,-165 -118,-165 -60.9623,43.0203 -104.7043,95.31305 -131,157 107.0306,-11.35117 171.4592,2.14879 249,8 z"
- id="path3359"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3452"
- d="m 1692,918 c -110.5535,5.92766 -224.7234,8.84163 -359,-5 63.2069,-26.59072 321.5698,-2.67475 359,5 z"
- style="fill:#622f0e;fill-opacity:1;stroke:#3a0e01;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6c4328;fill-opacity:1;stroke:#3a0e01;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1508,935 8,-213.5"
- id="path3357"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6c4328;fill-opacity:1;stroke:#3a0e01;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1635,995 c 29.7643,-24.4003 49.8907,-49.9344 57,-77 -110.5535,5.92766 -224.7234,8.84163 -359,-5 5.5233,27.6773 38.0625,43.5352 63.5,62.5 25.8682,-2.7935 52.6246,0.7519 79.1421,5.3387 30.4124,12.9327 57.2161,5.785 88.8314,5.7863 23.656,10e-4 47.051,6.4326 70.5265,8.375 z"
- id="path3351"
- sodipodi:nodetypes="cccccsc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6c4328;fill-opacity:1;stroke:#3a0e01;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1348.5,937.5 c 111.2085,7.9598 222.1155,12.6036 332,6"
- id="path3353"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6c4328;fill-opacity:1;stroke:#3a0e01;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1661,969 c -97.4419,0.9693 -194.8616,1.673 -291,-13"
- id="path3355"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- </g>
- <rect
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/maps/map-01-tl.png"
- height="600"
- y="0"
- x="0"
- width="800"
- id="rect2429"
- style="fill:#856241;fill-opacity:0;stroke:none" />
- <path
- transform="translate(1346.482,-50.25483)"
- sodipodi:type="arc"
- style="fill:#2de05e;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3201"
- sodipodi:cx="975"
- sodipodi:cy="875"
- sodipodi:rx="35"
- sodipodi:ry="35"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- inkscape:export-filename="/home/qubodup/bush.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- transform="translate(576.5,93.5)"
- id="g3306">
- <path
- style="fill:none;stroke:#430078;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 428,1393 1,-14 21,11 -3.5,19.5 3.5,-19 20,-8 -2,20.5"
- id="path3300"
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3302"
- d="m 429,1379 21,11 20,-7.5 -22,-11.25 -19,7.75 z"
- style="fill:#713aba;fill-opacity:1;stroke:#380078;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#713aba;fill-opacity:1;stroke:#380078;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 456.75,1343.5 21,11 -7.75,28 -22,-11.25 8.75,-27.75 z"
- id="path3304"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- style="fill:#ba3a3e;fill-opacity:1;stroke:#db074c;stroke-opacity:1"
- id="g3318"
- transform="matrix(-0.9966659,-0.0815906,-0.0815906,0.9966659,1462.0495,131.03969)">
- <path
- sodipodi:nodetypes="ccccccc"
- id="path3320"
- d="m 428,1393 1,-14 21,11 -3.5,19.5 3.5,-19 20,-8 0.49166,20.704"
- style="fill:none;stroke:#db074c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ba3a3e;fill-opacity:1;stroke:#db074c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 429,1379 21,11 20,-7.5 -22,-11.25 -19,7.75 z"
- id="path3322"
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3324"
- d="m 454.55269,1345.8285 21,11 L 470,1382.5 l -22,-11.25 6.55269,-25.4215 z"
- style="fill:#ba3a3e;fill-opacity:1;stroke:#db074c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- <g
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- transform="translate(581,89)"
- id="g3343">
- <g
- id="g3312"
- transform="translate(12.5,-9)">
- <path
- sodipodi:nodetypes="cc"
- id="path3294"
- d="m 387,1447 2.5,27.5"
- style="fill:#ba3a9f;fill-opacity:1;stroke:#780063;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3296"
- d="m 321,1439.5 -6,26.5"
- style="fill:#ba3a9f;fill-opacity:1;stroke:#780063;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3298"
- d="m 404,1386 12.5,62.5"
- style="fill:#ba3a9f;fill-opacity:1;stroke:#780063;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- transform="translate(-48,20)"
- d="m 474,1393 a 66,37 0 0 1 -66,37 66,37 0 0 1 -66,-37 66,37 0 0 1 66,-37 66,37 0 0 1 66,37 z"
- sodipodi:ry="37"
- sodipodi:rx="66"
- sodipodi:cy="1393"
- sodipodi:cx="408"
- id="path3292"
- style="fill:#ba3a9f;fill-opacity:1;stroke:#780063;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- </g>
- <g
- id="g3336"
- transform="translate(3.5,-1)">
- <path
- id="path3326"
- d="m 371.5,1404 3.5,-46"
- style="fill:none;stroke:#4c4c4c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cccc"
- id="path3328"
- d="m 369,1282 83.5,71 c -52.86072,32.0022 -101.30668,49.0575 -156,-2 l 72.5,-69 z"
- style="fill:#ffffff;fill-opacity:1;stroke:#aa0606;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f31111;fill-opacity:1;stroke:#aa0606;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 369,1282 -43.32943,89.6609 C 315.97998,1366.7709 306.22352,1360.0737 296.5,1351 l 72.5,-69 z"
- id="path3330"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff0000;fill-opacity:1;stroke:#aa0606;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 369,1282 34.82513,93.8332 c -8.01933,5.0522 -32.87763,8.8959 -40.23446,5.9389 L 369,1282 z"
- id="path3332"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff0000;fill-opacity:1;stroke:#aa0606;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 369,1282 83.5,71 c -9.36152,4.9649 -18.48843,9.6666 -27.46109,13.7936 L 369,1282 z"
- id="path3334"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- </g>
- </g>
- <path
- id="path3356"
- d="m 164.68891,196.32469 c -0.77457,-2.52998 -5.89261,-4.71167 -9.26549,-6.16663 -0.20811,-0.0898 -3.5823,3.93128 -4.07682,4.45367 -0.33898,0.35813 -0.29377,2.17889 -0.74125,4.4537 -0.40563,2.06241 -3.55263,6.22531 -4.07678,7.19437 -0.78526,1.4517 2.9206,1.86187 4.07678,3.08333 1.0907,1.15218 2.08061,2.14903 2.96498,3.08329 1.63302,1.72517 4.31965,2.08863 6.67115,2.74074 2.58718,0.71744 5.977,-0.6254 8.1536,-1.02778 2.28828,-0.42304 4.15438,-0.89813 5.55927,-1.37037 2.57072,-0.8641 -0.59059,-3.92901 -1.11183,-4.79625 -0.48912,-0.81384 1.64132,-3.81745 2.59433,-5.13885 0.78749,-1.09192 -2.7064,-2.69561 -3.33559,-3.08329 -1.51215,-0.9319 -3.71111,-1.88654 -4.81801,-2.39816 -0.9428,-0.43573 -1.24301,-0.49242 -2.59434,-1.02777 z"
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 242.91109,152.36394 c -3.99379,2.28405 0.32827,8.2371 2.18048,10.678 2.84946,12.16037 16.36711,7.50671 21.14996,-0.44072 1.38874,-2.61 2.88781,-5.15841 4.28024,-7.75892 -2.54367,-3.61856 -4.5459,-2.40224 -6.30507,-8.0452 -3.67115,-0.57753 -17.56521,4.09924 -21.30561,5.56684 z"
- id="path3364"
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0" />
- <g
- transform="translate(-148.99881,9.6438417)"
- id="g2623">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccc"
- id="path3209"
- d="M 432.5,231 424,406.25 c 5,5 25,5 30,0 L 452.5,231 l -20,0 z"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 499.74137,303.33486 -60.866,17.90336 c -1.45542,2.95185 1.73191,11.67356 4.781,13.08256 l 59.27233,-22.26421 -3.18733,-8.72171 z"
- id="path3237"
- sodipodi:nodetypes="ccccc"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:type="arc"
- style="fill:#39a80d;fill-opacity:1;stroke:#157800;stroke-width:18.88888931;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3233"
- sodipodi:cx="396"
- sodipodi:cy="242"
- sodipodi:rx="85"
- sodipodi:ry="85"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- transform="matrix(0.2117647,0,0,0.2117647,422.64118,256.75294)" />
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccc"
- id="path3239"
- d="m 365.3224,293.86375 75.24906,42.21638 c 4.24047,-1.41462 9.64298,-12.90316 8.10375,-17.23282 l -77.9503,-36.4721 -5.40251,11.48854 z"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- transform="matrix(0.2941176,0,0,0.2941176,265.02941,207.82353)"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- sodipodi:ry="85"
- sodipodi:rx="85"
- sodipodi:cy="242"
- sodipodi:cx="396"
- id="path3213"
- style="fill:#39a80d;fill-opacity:1;stroke:#1f9a05;stroke-width:13.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="fill:#299000;fill-opacity:1;stroke:#136c00;stroke-width:9.189188;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3286"
- sodipodi:cx="396"
- sodipodi:cy="242"
- sodipodi:rx="85"
- sodipodi:ry="85"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- transform="matrix(0.4352941,0,0,0.4352941,240.87352,155.40882)" />
- <path
- transform="matrix(0.4588235,0,0,0.4588235,286.55587,167.2147)"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- sodipodi:ry="85"
- sodipodi:rx="85"
- sodipodi:cy="242"
- sodipodi:cx="396"
- id="path3288"
- style="fill:#36be00;fill-opacity:1;stroke:#157800;stroke-width:8.71794796;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- style="fill:#5e441f;fill-opacity:1;stroke:#3e250c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 397,291.5 23.5,41.5 11,-57 -30,-34.5 -4.5,50 z"
- id="path3241"
- inkscape:connector-curvature="0" />
- <path
- id="path3243"
- d="m 494,326 -73.5,7 11,-57 56.75,0.75 L 494,326 z"
- style="fill:#6e4918;fill-opacity:1;stroke:#452f18;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- transform="matrix(0.2117647,0,0,0.2117647,393.64118,270.25294)"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- sodipodi:ry="85"
- sodipodi:rx="85"
- sodipodi:cy="242"
- sodipodi:cx="396"
- id="path3290"
- style="fill:#4cce18;fill-opacity:1;stroke:#1fa303;stroke-width:18.88888931;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="fill:#39a80d;fill-opacity:1;stroke:#157800;stroke-width:13.60000038;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3235"
- sodipodi:cx="396"
- sodipodi:cy="242"
- sodipodi:rx="85"
- sodipodi:ry="85"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- transform="matrix(0.2941176,0,0,0.2941176,334.52941,263.82353)" />
- <path
- style="fill:#6f4a15;fill-opacity:1;stroke:#4f2c09;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 401.5,241.5 60.75,3.5 26,31.75 -56.75,-0.75 -30,-34.5 z"
- id="path3245"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- transform="matrix(0.3764706,0,0,0.3764706,301.66764,133.64411)"
- d="m 481,242 a 85,85 0 0 1 -85,85 85,85 0 0 1 -85,-85 85,85 0 0 1 85,-85 85,85 0 0 1 85,85 z"
- sodipodi:ry="85"
- sodipodi:rx="85"
- sodipodi:cy="242"
- sodipodi:cx="396"
- id="path3217"
- style="fill:#39a80d;fill-opacity:1;stroke:#157800;stroke-width:10.62499905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- id="path3250"
- d="m 406.5,272.75 -3.15877,29.94834 7.51649,13.2738 L 418.5,285.75 l -12,-13 z"
- style="fill:#2d1d04;fill-opacity:1;stroke:#3e250c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#87531c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 410.5,316.5 c -0.73245,1.27192 -1.73719,4.65226 -2.5,6.75 -0.7046,1.93764 -0.41035,5.94823 0,8 0.49386,2.46928 1.02416,4.87078 1.5,7.25 0.93332,4.66657 0.91977,9.79534 1.75,14.5 0.36714,2.08048 -0.55374,3.86371 -1,5.5 -1.13606,4.16556 -1.57942,8.59806 -2.75,12.5 -0.5683,1.89432 -0.5,4.01491 -0.5,6 0,1.7731 0.32447,3.74468 0.5,5.5 0.18695,1.8695 0.39623,3.73115 0.75,5.5 0.36983,1.84917 -0.0784,4.03359 -0.25,5.75 -0.17411,1.74109 -0.75217,3.34055 -1.25,5 -0.1513,0.50433 -0.33562,0.83904 -0.5,1.25"
- id="path3252"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#87531c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 399.5,300.75 c -0.52126,1.73753 -2.43865,4.91504 -3.5,7.25 -1.07087,2.35591 -1.26355,4.64907 -1.5,7.25 -0.31846,3.50307 -0.023,6.33997 1,9.75 0.55403,1.84675 0.55675,3.56754 0.75,5.5 0.21996,2.19956 0.25,4.23243 0.25,6.5 0,2.38066 -0.57296,5.25716 -1,7.25 -0.66665,3.11102 -0.67862,6.35741 -1.25,9.5 -0.48123,2.64678 -1.10531,5.67122 -1.75,8.25 -0.68146,2.72583 0.53534,5.94439 1,8.5 0.29244,1.60842 0.87403,2.99677 1.25,4.25 0.57412,1.91372 0.25,4.26721 0.25,6.25 0,1.36184 -0.85737,2.94123 -1.25,4.25 -0.64466,2.14886 -1.63342,4.34196 -2.25,6.5 -0.30922,1.08229 -0.25,2.28948 -0.25,3.5"
- id="path3254"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#673b0c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 397,313.25 c 0,0 10.75,10.75 10.25,10.75"
- id="path3256"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#673b0c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 397.25,331.5 11.5,9.75"
- id="path3258"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#673b0c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 398.25,343.5 12,8.5"
- id="path3260"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#673b0c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 394.25,355 14,7.75"
- id="path3262"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#673b0c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 394,369.75 405.25,376"
- id="path3264"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#673b0c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 394.75,381.5 10.5,7.25"
- id="path3266"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#45290c;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 485,274.25 c -0.25,-0.75 3.25,-61 3.25,-61"
- id="path3268"
- inkscape:connector-curvature="0" />
- <g
- id="g3473"
- transform="translate(-1.0606602,-0.1767767)">
- <path
- id="path3270"
- d="m 489.25,213.25 c 2.70975,0.1766 7.56946,0.97084 11,2 4.00053,1.20016 8.55742,1 12.75,1 2.26724,0 4.46474,0 6.75,0 3.2203,0 6.45157,0.5 9.75,0.5 2.63845,0 5.26494,0.50149 7.75,0.75 2.05238,0.20524 4.17454,0.52736 5.75,1 2.94055,0.88216 3.56347,1.96155 4.25,4.25 0.47235,1.57449 0.3406,3.65596 0.5,5.25 0.18356,1.83563 0.17095,3.54048 0,5.25 -0.18612,1.8612 0,3.87829 0,5.75 0,1.81339 -0.25,4.05505 -0.25,5.75 0,1.45117 -0.59215,2.73038 -1,3.75 -1.06169,2.65421 -3.50692,2.5 -5.75,2.5 -2.29706,0 -4.50631,-0.0256 -6.75,-0.25 -3.07659,-0.30766 -6.02823,-1.45282 -9,-1.75 -2.52085,-0.25209 -4.92993,-1.01636 -7.5,-1.25 -2.54614,-0.23147 -5.34845,-0.87121 -8,-1.25 -1.41933,-0.20276 -2.70863,0.24172 -4,0.5 -2.16836,0.43367 -4.78498,0.25 -7,0.25 -1.38975,0 -3.01227,-0.25 -4.5,-0.25 -1.57902,0 -3.30973,-0.46195 -4.75,-0.75 -0.60411,-0.12082 -1.37935,0 -2,0 l 2,-33 z"
- style="fill:#9ff8f5;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3272"
- d="m 536.875,244.125 -17.625,-10 -3,-11.625 3,11.625 -15.625,2.75"
- style="fill:none;stroke:#4f331f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccccccc"
- id="path3274"
- d="m 516,222.25 c -0.72181,0.96848 -1.89548,1.46771 -2.87733,2.13057 -1.2371,0.62472 -2.46839,1.38494 -3.89477,1.43915 -1.16731,0.0816 -2.36351,0.25713 -3.3529,0.93028 -7.53971,4.27679 -7.93015,-0.55083 -7.5141,8.34637 0.0746,1.43029 0.0945,2.90187 -0.3609,4.27863 -0.3963,1.0426 0.70477,2.24411 1.75789,2.14604 0.95433,-0.10623 1.91021,0.1258 2.85622,0.0736 0.78473,-0.31058 1.80062,-0.86323 1.55757,-1.86776 -0.0805,-0.92852 -0.0108,-1.89609 -0.22075,-2.79574 l -0.0759,-0.0561"
- style="fill:none;stroke:#90552c;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3276"
- d="m 501.79863,222.81344 c -0.0338,-0.33839 -1.78768,1.9111 -2.05498,2.3121 -0.37635,0.56458 -0.59604,0.85817 -1.02749,1.41295 -0.4931,0.63404 -0.81912,1.4426 -1.15593,2.18365 -0.0354,0.0779 1.71302,2.19863 1.79811,2.3121 0.58591,0.78128 1.11822,0.74654 2.05499,1.0276 0.76224,0.22869 2.1348,-1.17772 2.69716,-1.66985 0.71229,-0.62332 1.51823,-1.2162 2.18342,-1.7983 0.89233,-0.78087 0.61532,-1.02367 0.77062,-1.5414 0.13476,-0.44924 -1.53923,-1.57176 -1.79811,-1.7983 -0.89263,-0.78114 -1.53388,-1.35015 -2.44029,-2.0552 -0.47612,-0.37036 -0.16366,-0.0614 -1.0275,-0.38535"
- style="fill:#51352c;fill-opacity:1;stroke:#90552c;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3279"
- d="m 540.24472,231.29233 c -0.19477,-0.68553 -1.48173,-1.27669 -2.32986,-1.67093 -0.0523,-0.0243 -0.90079,1.06523 -1.02514,1.20678 -0.0852,0.097 -0.0739,0.5904 -0.18639,1.20679 -0.102,0.55884 -0.89333,1.68683 -1.02513,1.94941 -0.19746,0.39336 0.7344,0.5045 1.02513,0.83547 0.27426,0.3122 0.52318,0.58231 0.74556,0.83546 0.41063,0.46746 1.0862,0.56594 1.6775,0.74264 0.65056,0.1944 1.50295,-0.16946 2.05027,-0.27849 0.5754,-0.11463 1.04464,-0.24336 1.39791,-0.37132 0.64642,-0.23414 -0.14851,-1.06462 -0.27958,-1.29961 -0.12299,-0.22052 0.41272,-1.03439 0.65236,-1.39244 0.19802,-0.29587 -0.68054,-0.73041 -0.83875,-0.83546 -0.38024,-0.25251 -0.93318,-0.51118 -1.21152,-0.64981 -0.23707,-0.11807 -0.31256,-0.13343 -0.65236,-0.27849 z"
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 530.74472,229.72983 c -0.19477,-0.68553 -1.48173,-1.27669 -2.32986,-1.67093 -0.0523,-0.0243 -0.90079,1.06523 -1.02514,1.20678 -0.0852,0.097 -0.0739,0.5904 -0.18639,1.20679 -0.102,0.55884 -0.89333,1.68683 -1.02513,1.94941 -0.19746,0.39336 0.7344,0.5045 1.02513,0.83547 0.27426,0.3122 0.52318,0.58231 0.74556,0.83546 0.41063,0.46746 1.0862,0.56594 1.6775,0.74264 0.65056,0.1944 1.50295,-0.16946 2.05027,-0.27849 0.5754,-0.11463 1.04464,-0.24336 1.39791,-0.37132 0.64642,-0.23414 -0.14851,-1.06462 -0.27958,-1.29961 -0.12299,-0.22052 0.41272,-1.03439 0.65236,-1.39244 0.19802,-0.29587 -0.68054,-0.73041 -0.83875,-0.83546 -0.38024,-0.25251 -0.93318,-0.51118 -1.21152,-0.64981 -0.23707,-0.11807 -0.31256,-0.13343 -0.65236,-0.27849 z"
- id="path3281"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 536.05722,222.66733 c -0.19477,-0.68553 -1.48173,-1.27669 -2.32986,-1.67093 -0.0523,-0.0243 -0.90079,1.06523 -1.02514,1.20678 -0.0852,0.097 -0.0739,0.5904 -0.18639,1.20679 -0.102,0.55884 -0.89333,1.68683 -1.02513,1.94941 -0.19746,0.39336 0.7344,0.5045 1.02513,0.83547 0.27426,0.3122 0.52318,0.58231 0.74556,0.83546 0.41063,0.46746 1.0862,0.56594 1.6775,0.74264 0.65056,0.1944 1.50295,-0.16946 2.05027,-0.27849 0.5754,-0.11463 1.04464,-0.24336 1.39791,-0.37132 0.64642,-0.23414 -0.14851,-1.06462 -0.27958,-1.29961 -0.12299,-0.22052 0.41272,-1.03439 0.65236,-1.39244 0.19802,-0.29587 -0.68054,-0.73041 -0.83875,-0.83546 -0.38024,-0.25251 -0.93318,-0.51118 -1.21152,-0.64981 -0.23707,-0.11807 -0.31256,-0.13343 -0.65236,-0.27849 z"
- id="path3283"
- inkscape:connector-curvature="0" />
- </g>
- <path
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 460.45999,403.33587 c 1.1757,4.44803 8.04267,1.80916 10.87897,0.64981 12.48378,0.38615 11.47725,-13.87464 5.0338,-20.54692 -2.16306,-2.01541 -4.23813,-4.12151 -6.39107,-6.13804 -4.15253,1.52338 -3.49429,3.77172 -9.40011,4.01462 -1.50561,3.39764 -0.57392,18.02806 -0.12159,22.02053 z"
- id="path3366"
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cccccc"
- id="path3368"
- d="m 479.75193,405.99404 c 1.25711,0.6224 1.9358,-1.41902 2.19997,-2.27596 2.4408,-2.68301 -1.06932,-5.28927 -3.83633,-5.18842 -0.87662,0.0784 -1.75779,0.11932 -2.63276,0.19524 -0.42727,1.22011 0.22021,1.52058 -0.83539,2.87428 0.5076,1.00678 4.0897,3.7029 5.10451,4.39486 z"
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:1.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:transform-center-x="-5.0631154"
- inkscape:transform-center-y="-4.7916795"
- inkscape:connector-curvature="0" />
- </g>
- <g
- style="fill:#ffad00;fill-opacity:1;stroke:#f3e121;stroke-opacity:1"
- id="g3370"
- transform="translate(563,159)">
- <path
- sodipodi:nodetypes="ccccccc"
- id="path3372"
- d="m 428,1393 1,-14 21,11 -3.5,19.5 3.5,-19 20,-8 -2,20.5"
- style="fill:none;stroke:#f3e121;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffad00;fill-opacity:1;stroke:#f3e121;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 429,1379 21,11 20,-7.5 -22,-11.25 -19,7.75 z"
- id="path3374"
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3377"
- d="m 447.25,1365 30.5,-10.5 -7.75,28 -19,7.75 -3.75,-25.25 z"
- style="fill:#ffad00;fill-opacity:1;stroke:#f3e121;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- <g
- inkscape:transform-center-x="-5.5"
- transform="matrix(-0.9937063,-0.1120166,-0.1120166,0.9937063,1501.2067,216.42737)"
- id="g3379"
- style="fill:#ff6e00;fill-opacity:1;stroke:#f34321;stroke-width:1;stroke-opacity:1">
- <path
- style="fill:none;stroke:#f34321;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 422.09377,1391.831 429,1379 l 21,11 -5.15136,16.2948 L 450,1390.5 l 20,-8 4.4103,17.1973"
- id="path3381"
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3383"
- d="m 429,1379 21,11 20,-7.5 -22,-11.25 -19,7.75 z"
- style="fill:#ff6e00;fill-opacity:1;stroke:#f34321;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff6e00;fill-opacity:1;stroke:#f34321;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 452.54736,1367.1067 22.1095,-11.949 L 470,1382.5 l -19,7.75 1.54736,-23.1433 z"
- id="path3385"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- </g>
- <path
- style="fill:#9d9d9d;fill-opacity:1;stroke:#6d6560;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1115.1135,1656.19 c -0.7746,-2.53 -5.8926,-4.7117 -9.2655,-6.1667 -0.2081,-0.09 -3.5823,3.9313 -4.0768,4.4537 -0.339,0.3581 -0.2938,2.1789 -0.7413,4.4537 -0.4056,2.0624 -3.5526,6.2253 -4.0768,7.1944 -0.7852,1.4517 2.9206,1.8618 4.0768,3.0833 1.0907,1.1522 2.0806,2.149 2.965,3.0833 1.633,1.7252 4.3197,2.0886 6.6712,2.7407 2.5871,0.7175 5.977,-0.6254 8.1536,-1.0278 2.2882,-0.423 4.1543,-0.8981 5.5592,-1.3703 2.5707,-0.8641 -0.5906,-3.929 -1.1118,-4.7963 -0.4891,-0.8138 1.6413,-3.8174 2.5943,-5.1388 0.7875,-1.0919 -2.7064,-2.6956 -3.3356,-3.0833 -1.5121,-0.9319 -3.7111,-1.8866 -4.818,-2.3982 -0.9428,-0.4357 -1.243,-0.4924 -2.5943,-1.0277 z"
- id="path3387"
- inkscape:connector-curvature="0" />
- <g
- transform="translate(-171.28658,656.7719)"
- id="g3544">
- <path
- style="fill:#773200;fill-opacity:1;stroke:#421d16;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2184.5,881.5 -125,-70 -127,84 -6,15 130,-77 134,63 -6,-15 z"
- id="path3395"
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dfd100;fill-opacity:1;stroke:#fff400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2057.5,825.5 -123,77 145,87 105,-96 -127,-68 z"
- id="path3400"
- inkscape:connector-curvature="0" />
- <path
- id="path3393"
- d="m 2184.5,881.5 -102,101 -3,22 111,-108 -6,-15 z"
- style="fill:#773200;fill-opacity:1;stroke:#421d16;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#773200;fill-opacity:1;stroke:#421d16;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1932.5,895.5 150,87 -3,22 -153,-94 6,-15 z"
- id="path3391"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dfd100;fill-opacity:1;stroke:#fff400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2010,867 c 2.5206,-0.35818 5.7663,-2.38314 9,-4 3.0099,-1.50497 5.0064,-5.05913 8.5,-7 4.0324,-2.2402 8.8293,2.09757 12,4 3.6977,2.21863 8.4467,3.96445 11.5,6"
- id="path3402"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dfd100;fill-opacity:1;stroke:#fff400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2062.5,913 c 0.762,0.45719 15.6903,-9.34515 18,-10.5 8.8384,-4.41923 8.2772,-9.32228 16.5,-8.5 3.3031,0.33031 6.9616,2.25876 9,3 2.1554,0.78379 4.4731,0.49462 7,1"
- id="path3404"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dfd100;fill-opacity:1;stroke:#fff400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1979,894 c 1.3876,0.50458 16.2082,-2.82296 21.5,-1.5 8.2834,2.07086 10.1174,0.41129 13.5,6.5 2.4827,4.46886 6.0168,6.17785 9.5,8.5"
- id="path3406"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dfd100;fill-opacity:1;stroke:#fff400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2082.5,871.5 c 2.6215,4.71874 10.6241,-2.01128 16,-2.5 3.697,-0.33609 11.3146,7.02244 14.5,9.5 5.5592,4.32383 13.3925,4.61213 20,6.5"
- id="path3408"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#dfd100;fill-opacity:1;stroke:#fff400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2064.5,946 c 3,2.33333 4.1594,-6.47503 7,-9 1.4738,-1.31007 9.6448,-0.5 11.5,-0.5 3.5368,0 8.0244,-1.22949 11,-1.5 1.7877,-0.16252 3.3333,1.33333 5,2"
- id="path3410"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#3bdf00;fill-opacity:1;stroke:#54ff00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2049,847.5 c 0,0.5 -1.5,9.25 -1.5,9.25 l 10.5,8 8.75,-10.25 -17.75,-7 z"
- id="path3412"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#54ff00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2051.5,847.75 3,-13.75 15,9.25 -5.5,11"
- id="path3414"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#00df8b;fill-opacity:1;stroke:#00ffad;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2123,897.25 c -3.0654,3.68154 -4.795,7.2295 -1.25,10.25 3.4389,2.38323 7.145,2.36136 11.25,-1.25 l -10,-9 z"
- id="path3416"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#00ffad;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2128.25,901.25 16,-13.5 -5.5,-5.75 12,11.5"
- id="path3418"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="translate(596,1486)"
- id="g3447">
- <path
- sodipodi:nodetypes="cc"
- id="path3449"
- d="m 1501,92 -15,29"
- style="fill:#8e4d13;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3451"
- d="m 1591.5,65 -8,26.5"
- style="fill:#8e4d13;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3453"
- d="m 1510,107.5 -3.5,27.5"
- style="fill:#8e4d13;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3457"
- d="m 1608,95 c -1,-2 -4,-25 -4,-25"
- style="fill:#8e4d13;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3459"
- d="m 1479.5,94.5 12,18 130,-49 -17,-18 -125,49 z"
- style="fill:#8e4d13;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3463"
- d="M 1646,42 1497.25,97.25 1499,123 1635,69 1646,42 z"
- style="fill:#8e4d13;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="translate(30,125)"
- id="g3560">
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- sodipodi:nodetypes="ccccccccccccc"
- id="path3465"
- d="m 2275.5,474.25 -2.5358,35.81825 -44.2774,-19.51964 -5.6566,8.14858 48.8107,32.36234 L 2267.5,587.25 c 5,5 25,5 30,0 l -1.2745,-29.6953 14.3033,-10.22116 -0.6898,-12.7837 -14.3668,5.45136 -2.9722,-69.2512 -17,3.5 z"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- transform="translate(1462.5,-323)"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- d="m 860,800 a 40,65 0 0 1 -40,65 40,65 0 0 1 -40,-65 40,65 0 0 1 40,-65 40,65 0 0 1 40,65 z"
- sodipodi:ry="65"
- sodipodi:rx="40"
- sodipodi:cy="800"
- sodipodi:cx="820"
- id="path3467"
- style="fill:#20a205;fill-opacity:1;stroke:#084214;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="fill:#05a210;fill-opacity:1;stroke:#084214;stroke-width:8.20450592;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3469"
- sodipodi:cx="820"
- sodipodi:cy="800"
- sodipodi:rx="40"
- sodipodi:ry="65"
- d="m 860,800 a 40,65 0 0 1 -40,65 40,65 0 0 1 -40,-65 40,65 0 0 1 40,-65 40,65 0 0 1 40,65 z"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- transform="matrix(0.6,0,0,0.3961538,1833,213.82692)" />
- </g>
- <g
- transform="translate(-563,55)"
- id="g3355">
- <path
- sodipodi:nodetypes="ccccc"
- id="path3473"
- d="m 1986.2737,1522 10.25,-32.75 -18.25,-4.5 c -11.5643,10.3226 -13.0413,17.3681 -16.75,29 7.1897,10.4309 13.6717,9.485 24.75,8.25 z"
- style="fill:#986628;fill-opacity:1;stroke:#6c4b23;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#905612;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2071,1441 -149,103 12,12 148,-104 -11,-11 z"
- id="path3475"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3477"
- d="m 2079,1468 -144,99 -1,-11 148,-104 -3,16 z"
- style="fill:#905612;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#986628;fill-opacity:1;stroke:#6c4b23;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2002,1538 8,-42 14,8 c 7.0576,-1.5684 5.831,34.419 4,39 -3.2365,8.0973 -26.1692,3.2615 -26,-5 z"
- id="path3471"
- sodipodi:nodetypes="cccsc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#905612;fill-opacity:1;stroke:#6c491f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1922,1544 12,12 1,11 -14,-12.25 1,-10.75 z"
- id="path3479"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#8d8d8d;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2047.5,1457.5 c 7.3332,-12.27 10.4557,-4.0132 12.5,9.5"
- id="path3484"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3486"
- d="m 1942,1530 c 7.3332,-12.27 10.4557,-4.0132 12.5,9.5"
- style="fill:none;stroke:#8d8d8d;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="translate(1474.3488,406.80998)"
- id="g3547">
- <path
- style="fill:none;stroke:#7a7a7a;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 612,1016 c 0,-2 54,-175 54,-175 l 20,212"
- id="path3501"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#6a4517;fill-opacity:1;stroke:#422306;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 689.75,967.25 43.5,-20.5 21,9.5 -44.75,22.5 -19.75,-11.5 z"
- id="path3519"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#454545;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 714,815 706.17978,936.9955 693,966"
- id="path3507"
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <path
- id="path3503"
- d="m 738,941 c 0,-2 54,-175 54,-175 l 20,212"
- style="fill:none;stroke:#7a7a7a;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#454545;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 749,792 c -1.93137,43.31782 -3.86274,87.34167 -5.7941,129.95345 L 732.25,947.25"
- id="path3509"
- sodipodi:nodetypes="ccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#7a7a7a;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 666.625,840.875 791.25,766.125"
- id="path3505"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#454545;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 714.5,822.5 c 3.34447,-0.24855 4.59643,-2.75307 7,-5.5 1.91752,-2.19145 1.72358,-4.73581 2,-7.5 0.33144,-3.31444 -1.47077,-5.66961 -2.5,-8.5 -0.41468,-1.14038 -6.42235,-0.5 -7.5,-0.5 -2.37715,0 -3.61421,3.90558 -4.5,5.5 -0.22739,0.40931 0,1.95716 0,2.5"
- id="path3511"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#454545;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 749.5,800 c -1.37933,2.48279 6.62406,-1.79114 7,-2 2.97194,-1.65108 2.00279,-3.50698 3,-6 1.14147,-2.85367 -1.60608,-5.39094 -2.5,-7 -2.38415,-4.29146 -3.88787,-3.13879 -7.5,-3.5 -2.71204,-0.2712 -5.78725,2.7707 -8,4 -1.2448,0.69156 1,2.66667 1.5,4"
- id="path3513"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#454545;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 706.5,938 3.25,37"
- id="path3515"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#454545;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 743.5,922.25 8,32"
- id="path3517"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="translate(-47.44947,151.5448)"
- id="g3559">
- <path
- style="fill:none;stroke:#838383;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 160.125,1355.25 196,1352"
- id="path3541"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#838383;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 132,1435 37,-112 38,1 -33.5,101"
- id="path3539"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#838383;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="M 187.5,1380.25 148,1387"
- id="path3543"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#838383;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 138,1416 39.5,-6.75"
- id="path3545"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#5f5f58;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 169,1334 c 1.70244,41.0929 1.83333,82.9715 2.75,124.4573 l 39.25,-45.9147 -42,-30.189 45,-45.9756 -45,-2.378 z"
- id="path3523"
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#5f5f58;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 169,1334.7927 37,40.4268 -35,47.561 42.75,22.2195 c -3.45042,-36.4716 -3.83333,-72.9431 -5.75,-109.4147 l -39,-0.7926 z"
- id="path3525"
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#7b7b7b;fill-opacity:1;stroke:#474744;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 208.4106,1324.0129 c 20.84162,48.9805 50.93497,90.5793 99.86755,117.1469 L 303.5,1465 C 232.45781,1430.5046 189.96065,1391.2895 170,1323.1701 l 38.4106,0.8428 z"
- id="path3521"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#474746;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 209,1327 2,-45 -39,5 1,35"
- id="path3527"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3533"
- d="m 171.80132,1306.3711 c 32.62234,83.6259 75.23529,122.6278 140.31789,149.9588 L 304.5,1466 C 233.45781,1431.5046 189.96065,1391.2895 170,1323.1701 l 1.80132,-16.799 z"
- style="fill:#9a6060;fill-opacity:1;stroke:#474744;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3535"
- d="m 208.4106,1324.0129 c 20.84162,48.9805 50.93497,90.5793 99.86755,117.1469 l 6.42053,-10.799 c -59.14801,-37.4307 -70.419,-65.0906 -104.32782,-124.8608 l -1.96026,18.5129 z"
- style="fill:#9a6060;fill-opacity:1;stroke:#474744;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g7592"
- transform="translate(59.999605,232.83708)">
- <path
- inkscape:connector-curvature="0"
- style="fill:#532e0a;fill-opacity:1;stroke:#270e07;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 493.35824,1309.8756 -2.5358,35.8183 -44.2774,-19.5197 -5.6566,8.1486 48.8107,32.3623 -4.3409,56.1905 c 5,5 25,5 30,0 l -1.2745,-29.6953 14.3033,-10.2212 -0.6898,-12.7837 -14.3668,5.4514 -2.9722,-69.2512 -17,3.5 z"
- id="path2559"
- sodipodi:nodetypes="ccccccccccccc"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- transform="matrix(0.6875,0,0,0.3961538,-103.39176,1005.4525)"
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- d="m 860,800 a 40,65 0 0 1 -40,65 40,65 0 0 1 -40,-65 40,65 0 0 1 40,-65 40,65 0 0 1 40,65 z"
- sodipodi:ry="65"
- sodipodi:rx="40"
- sodipodi:cy="800"
- sodipodi:cx="820"
- id="path2563"
- style="fill:#05a210;fill-opacity:1;stroke:#084214;stroke-width:7.664639;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc" />
- <path
- sodipodi:type="arc"
- style="fill:#20a205;fill-opacity:1;stroke:#084214;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path2561"
- sodipodi:cx="820"
- sodipodi:cy="800"
- sodipodi:rx="40"
- sodipodi:ry="65"
- d="m 860,800 a 40,65 0 0 1 -40,65 40,65 0 0 1 -40,-65 40,65 0 0 1 40,-65 40,65 0 0 1 40,65 z"
- inkscape:export-filename="/home/qubodup/playground-wars/playground-wars/data/units/tree-01.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- transform="matrix(0.9903468,0.1386121,-0.1386121,0.9903468,-186.83644,385.68631)" />
- </g>
- <path
- inkscape:export-ydpi="90"
- inkscape:export-xdpi="90"
- inkscape:export-filename="/home/qubodup/bush.png"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- sodipodi:ry="35"
- sodipodi:rx="35"
- sodipodi:cy="875"
- sodipodi:cx="975"
- id="path2565"
- style="fill:#3fd468;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- sodipodi:type="arc"
- transform="translate(1302.482,-48.25483)" />
- <path
- transform="translate(1319.482,-11.25483)"
- sodipodi:type="arc"
- style="fill:#2cb652;fill-opacity:1;stroke:#007b1a;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path2567"
- sodipodi:cx="975"
- sodipodi:cy="875"
- sodipodi:rx="35"
- sodipodi:ry="35"
- d="m 1010,875 a 35,35 0 0 1 -35,35 35,35 0 0 1 -35,-35 35,35 0 0 1 35,-35 35,35 0 0 1 35,35 z"
- inkscape:export-filename="/home/qubodup/bush.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <g
- transform="matrix(0.7710269,0,0,0.7710269,-40.420309,827.67522)"
- id="g3349">
- <path
- sodipodi:type="arc"
- style="fill:#724826;fill-opacity:1;stroke:#4a311d;stroke-width:5.56504488;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- id="path3337"
- sodipodi:cx="2230.5"
- sodipodi:cy="1071"
- sodipodi:rx="83.5"
- sodipodi:ry="42"
- d="m 2314,1071 a 83.5,42 0 0 1 -83.5,42 83.5,42 0 0 1 -83.5,-42 83.5,42 0 0 1 83.5,-42 83.5,42 0 0 1 83.5,42 z"
- transform="matrix(1,0,0,0.8690476,0,145.75)" />
- <path
- style="fill:none;stroke:#7a7a7a;stroke-width:5.18788671;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2204,1041.1009 c -3.6647,-109.10192 73.095,-21.0015 69.5,64.8991"
- id="path3342"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#7a7a7a;stroke-width:5.18788671;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2278.5,1045.4275 c 0.8744,-91.68769 -98.1827,-44.8921 -100.5,58.4092"
- id="path3344"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#7a7a7a;stroke-width:5.18788671;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 2314,1072.2525 c -0.8325,-94.68784 -176.6861,-103.86517 -166.5,3.4613"
- id="path3346"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- style="stroke:#3c2211;stroke-opacity:1"
- transform="matrix(-1,0,0,1,1941.6793,1399.7924)"
- id="g3364">
- <path
- sodipodi:nodetypes="cc"
- id="path3367"
- d="m 1531.5,125 -15,29"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3369"
- d="m 1622,98 -8,26.5"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3371"
- d="M 1540.5,140.5 1537,168"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path3373"
- d="m 1637,108 8,22.5"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3375"
- d="m 1608,95 c -1,-2 -4,-25 -4,-25"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3379"
- d="m 1512,131 12,18 130,-49 -17,-18 -125,49 z"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3382"
- d="m 1538,121 -8,-18"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- id="path3390"
- d="M 1644,39 1495.25,94.25 1497,120 1633,66 1644,39 z"
- style="fill:#8e4d13;fill-opacity:1;stroke:#3c2211;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="translate(410.13434,140.03201)"
- id="g2614">
- <path
- style="fill:#b3b3b3;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1352.375,1056.875 9.5,-28.125 15.625,26.75"
- id="path3394"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b3b3b3;fill-opacity:1;stroke:#ffffff;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1333,1058 7.0388,10.8781 c 6.8717,-2.099 12.9523,-2.4183 17.9395,-0.2772 8.8156,3.9426 17.6312,1.5946 26.4468,-0.4088 L 1393,1055 l -60,3 z"
- id="path3392"
- sodipodi:nodetypes="cccccc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(0.5306716,0,0,0.5306716,1542.3427,780.6423)"
- id="g3411">
- <path
- style="fill:#ffffff;fill-opacity:1;stroke:#d9d9d9;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 624.47186,624.42853 c 2.07837,-6.70403 6.7447,-13.38062 14.21826,-14.36222 6.20284,-0.89951 13.39406,0.80214 16.63604,6.67211 4.07919,6.20651 1.14118,13.94762 3.86325,20.59884 1.42255,6.4613 9.40983,9.81892 16.61859,9.924 7.00914,1.37327 15.56871,-1.08245 21.93276,-4.06941 9.44226,-3.30088 12.64664,-5.48587 21.5744,-9.82202 5.73647,-1.81465 11.755,-3.83568 17.85207,-3.58607 6.25013,0.18268 10.45419,7.67493 7.52551,13.09064 -3.48099,4.49192 -7.68173,8.43013 -11.57955,12.57936 -7.76144,6.06351 -14.50841,13.70294 -23.83388,17.49109 -5.73531,3.58297 -9.20151,5.07083 -15.74062,4.83829 -7.04543,0.0863 -17.06224,-3.18482 -24.11382,-3.68625 -7.22584,0.21754 -14.70282,3.27694 -21.88112,3.98361 -7.41064,1.85869 -11.55287,-9.47189 -8.90875,-14.19947 2.40005,-4.76413 3.48567,-8.2288 3.07711,-13.25273 -1.61989,-5.10422 -2.56442,-9.13323 -6.82746,-12.34001 -5.83859,-0.2718 -12.49673,3.86186 -18.20145,4.04671 -5.82595,0.58905 -12.7529,2.06884 -18.38266,0.76653 -7.99391,0.4944 -1.67354,-14.86327 4.49011,-15.48395 5.66136,-0.2038 11.29163,1.58837 17.02456,0.66428 2.00002,-0.0238 5.0153,-1.43153 4.65665,-3.85333 z"
- id="path3399"
- sodipodi:nodetypes="cccccccccccccccccccccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccc"
- id="path3403"
- d="m 624.47186,624.42853 c 6.68451,3.13673 12.27986,6.77615 10.41279,13.85976 -5.83859,-0.2718 -12.49673,3.86186 -18.20145,4.04671 -5.82595,0.58905 -12.7529,2.06884 -18.38266,0.76653 -7.99391,0.4944 -1.67354,-14.86327 4.49011,-15.48395 5.66136,-0.2038 11.29163,1.58837 17.02456,0.66428 2.00002,-0.0238 5.0153,-1.43153 4.65665,-3.85333 z"
- style="fill:#fddf00;fill-opacity:1;stroke:#f16400;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#fddf00;fill-opacity:1;stroke:#f16400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 604,634 5.75,-0.5"
- id="path3405"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#585858;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 636.75,620.5 c 1.28341,-1.74987 2.98262,-2.80674 6.25,-1.25"
- id="path3407"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#d9d9d9;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 679.25,655.25 c 8.22069,-4.67033 21.24897,-4.12449 30.5,-8.75 5.42745,-2.71373 16.72603,-1.627 21.25,-1.25 5.77968,0.48164 -7.07647,13.51274 -19,15.5 -7.49924,1.24987 -15.1088,2.6196 -22.25,5 -0.88191,0.29397 -1.56912,0.62765 -2.5,1"
- id="path3409"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g3443"
- transform="translate(790.70908,1044.594)">
- <path
- sodipodi:nodetypes="cccccccccccccccccccccc"
- id="path3421"
- d="m 1083.3029,209.6433 c -1.1029,-3.55764 -3.5792,-7.10072 -7.5452,-7.62163 -3.2917,-0.47734 -7.1079,0.42568 -8.8283,3.5407 -2.1647,3.29362 -0.6056,7.40161 -2.0501,10.93122 -0.7549,3.42883 -4.9935,5.21063 -8.819,5.26639 -3.7196,0.72875 -8.2619,-0.57443 -11.6391,-2.15952 -5.0107,-1.75169 -6.7112,-2.9112 -11.4489,-5.21227 -3.0442,-0.96298 -6.2381,-2.03549 -9.4736,-1.90302 -3.3168,0.0969 -5.5478,4.07286 -3.9936,6.94683 1.8473,2.38373 4.0765,4.47363 6.145,6.67551 4.1187,3.21773 6.6992,8.27176 11.6479,10.28202 3.0436,1.90138 4.383,0.44095 7.8531,0.31754 3.7388,0.0458 12.0545,4.30991 15.7965,4.04382 3.8346,0.11544 6.3024,-3.01103 10.1117,-2.63602 3.9326,0.98636 6.1308,-5.02646 4.7276,-7.53525 -1.2736,-2.52819 -1.8497,-4.36679 -1.6329,-7.03285 0.8596,-2.70866 1.3609,-4.84674 3.6231,-6.54849 3.0984,-0.14424 6.6317,2.04938 9.659,2.14747 3.0917,0.31259 6.7676,1.09788 9.7552,0.40678 4.2421,0.26236 0.8881,-7.88752 -2.3828,-8.21689 -3.0043,-0.10816 -5.9921,0.8429 -9.0344,0.35251 -1.0614,-0.0126 -2.6615,-0.75967 -2.4712,-2.04485 z"
- style="fill:#ffffff;fill-opacity:1;stroke:#929292;stroke-width:2.12268639;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#fdac00;fill-opacity:1;stroke:#f14f00;stroke-width:2.12268639;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1083.3029,209.6433 c -3.5473,1.66457 -6.5166,3.59591 -5.5258,7.35498 3.0984,-0.14424 6.6317,2.04938 9.659,2.14747 3.0917,0.31259 6.7676,1.09788 9.7552,0.40678 4.2421,0.26236 0.8881,-7.88752 -2.3828,-8.21689 -3.0043,-0.10816 -5.9921,0.8429 -9.0344,0.35251 -1.0614,-0.0126 -2.6615,-0.75967 -2.4712,-2.04485 z"
- id="path3423"
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0" />
- <path
- id="path3426"
- d="m 1094.1668,214.7226 -3.0514,-0.26533"
- style="fill:#fddf00;fill-opacity:1;stroke:#f16400;stroke-width:1.06134319;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#0d0dad;stroke-width:1.6137464;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- d="m 1074.2444,208.81407 c 0.1003,0.066 0.3785,-0.21226 0.5088,-0.3149 0.1009,-0.0795 0.2458,-0.51005 0.3149,-0.6298"
- id="path3436"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3432"
- d="m 1076.7873,207.55854 c -5.3454,8.77809 -4.3287,0.58308 -5.0667,-0.66334 1.7209,-1.48639 3.5078,-1.99141 5.0667,0.66334 z"
- style="fill:none;stroke:#585858;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- <path
- id="path3434"
- d="m 1054.2337,225.99938 c -4.3625,-2.47842 -11.2762,-2.18875 -16.1855,-4.64338 -2.8802,-1.4401 -8.876,-0.8634 -11.2767,-0.66334 -3.0672,0.25559 3.7552,7.17083 10.0827,8.22541 3.9797,0.66327 8.0178,1.39015 11.8075,2.65336 0.468,0.156 0.8327,0.33307 1.3266,0.53067"
- style="fill:none;stroke:#929292;stroke-width:2.12268639;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- inkscape:connector-curvature="0" />
- </g>
- </g>
+ transform="translate(0,-159.41665)">
+ <rect
+ style="opacity:1;vector-effect:none;fill:url(#linearGradient1009);fill-opacity:1;stroke:#3962ff;stroke-width:0.2654644;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect1559"
+ width="211.4012"
+ height="137.31787"
+ x="0.1327322"
+ y="159.54938" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 37.154791,282.15901 c 3.81317,-1.82369 15.418474,-5.05659 15.418474,-5.05659 2.321059,2.48684 12.600042,4.72502 15.086892,4.8908 -5.30528,0.0829 -14.257943,-2.40395 -15.750053,-3.2329 -2.32106,0.33158 -14.755313,3.39869 -14.755313,3.39869 z"
+ id="path1561"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 122.49918,288.72397 c 3.81317,-1.82369 15.41849,-5.0566 15.41849,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30529,0.0829 -14.25795,-2.40396 -15.75007,-3.23291 -2.32106,0.33158 -14.75533,3.3987 -14.75533,3.3987 z"
+ id="path1561-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 76.544496,295.28892 c 3.813171,-1.82369 15.418476,-5.0566 15.418476,-5.0566 2.321064,2.48685 12.600048,4.72503 15.086908,4.89081 -5.30529,0.0829 -14.257957,-2.40395 -15.75007,-3.2329 -2.321058,0.33158 -14.755314,3.39869 -14.755314,3.39869 z"
+ id="path1561-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 86.391923,275.59406 c 3.81317,-1.82369 15.418477,-5.0566 15.418477,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30528,0.0829 -14.25796,-2.40395 -15.75007,-3.23291 -2.321056,0.33158 -14.755317,3.3987 -14.755317,3.3987 z"
+ id="path1561-6-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 53.567169,259.18167 c 3.81317,-1.82369 15.418473,-5.0566 15.418473,-5.0566 2.32106,2.48685 12.600042,4.72503 15.086893,4.89081 -5.305281,0.0829 -14.257944,-2.40395 -15.750054,-3.2329 -2.32106,0.33158 -14.755312,3.39869 -14.755312,3.39869 z"
+ id="path1561-62"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 132.34662,269.0291 c 3.81317,-1.82369 15.41849,-5.05659 15.41849,-5.05659 2.32106,2.48684 12.60005,4.72502 15.0869,4.8908 -5.30529,0.0829 -14.25795,-2.40395 -15.75006,-3.2329 -2.32106,0.33158 -14.75533,3.39869 -14.75533,3.39869 z"
+ id="path1561-3-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 96.239353,255.89919 c 3.813167,-1.82368 15.418487,-5.05659 15.418487,-5.05659 2.32107,2.48685 12.60006,4.72502 15.08691,4.8908 -5.30529,0.0829 -14.25796,-2.40395 -15.75007,-3.2329 -2.32106,0.33158 -14.755327,3.39869 -14.755327,3.39869 z"
+ id="path1561-6-5-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 63.414595,239.48681 c 3.813168,-1.82369 15.418473,-5.0566 15.418473,-5.0566 2.321063,2.48685 12.600047,4.72502 15.086896,4.89081 -5.305285,0.0829 -14.257944,-2.40395 -15.750057,-3.23291 -2.321057,0.33158 -14.755312,3.3987 -14.755312,3.3987 z"
+ id="path1561-62-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 4.330038,272.31158 c 3.8131668,-1.82369 15.418471,-5.0566 15.418471,-5.0566 2.321063,2.48685 12.600045,4.72502 15.086892,4.89081 -5.30528,0.0829 -14.25794,-2.40395 -15.750053,-3.2329 -2.321056,0.33158 -14.75531,3.39869 -14.75531,3.39869 z"
+ id="path1561-3-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 14.177463,252.61672 c 3.813167,-1.82369 15.418473,-5.0566 15.418473,-5.0566 2.321062,2.48685 12.600045,4.72502 15.086892,4.8908 -5.305281,0.0829 -14.257941,-2.40395 -15.750054,-3.2329 -2.321056,0.33158 -14.755311,3.3987 -14.755311,3.3987 z"
+ id="path1561-3-3-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 17.459937,232.92185 c 3.813172,-1.82369 15.418474,-5.05659 15.418474,-5.05659 2.32106,2.48684 12.600043,4.72502 15.086894,4.8908 -5.305281,0.0829 -14.257945,-2.40395 -15.750055,-3.2329 -2.32106,0.33158 -14.755313,3.39869 -14.755313,3.39869 z"
+ id="path1561-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 109.36927,232.92185 c 3.81317,-1.82369 15.41849,-5.05659 15.41849,-5.05659 2.32106,2.48684 12.60006,4.72502 15.08691,4.8908 -5.30529,0.0829 -14.25796,-2.40395 -15.75008,-3.2329 -2.32105,0.33158 -14.75532,3.39869 -14.75532,3.39869 z"
+ id="path1561-3-20"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 63.414594,239.48681 c 3.813171,-1.82369 15.418474,-5.0566 15.418474,-5.0566 2.321063,2.48685 12.600047,4.72502 15.086896,4.89081 -5.305285,0.0829 -14.257944,-2.40395 -15.750057,-3.23291 -2.321057,0.33158 -14.755313,3.3987 -14.755313,3.3987 z"
+ id="path1561-6-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 73.262022,219.79194 c 3.813167,-1.82368 15.418472,-5.05659 15.418472,-5.05659 2.321065,2.48685 12.600056,4.72502 15.086896,4.8908 -5.305279,0.0829 -14.257944,-2.40395 -15.750057,-3.2329 -2.321057,0.33158 -14.755311,3.39869 -14.755311,3.39869 z"
+ id="path1561-6-5-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 33.872315,216.50947 c 3.813168,-1.82369 15.418474,-5.0566 15.418474,-5.0566 2.321062,2.48685 12.600046,4.72502 15.086891,4.8908 -5.30528,0.0829 -14.257939,-2.40395 -15.750052,-3.2329 -2.321058,0.33158 -14.755313,3.3987 -14.755313,3.3987 z"
+ id="path1561-3-2-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 142.92996,247.86242 c 3.81317,-1.82369 15.41849,-5.05659 15.41849,-5.05659 2.32106,2.48684 12.60005,4.72502 15.0869,4.8908 -5.30529,0.0829 -14.25795,-2.40395 -15.75006,-3.2329 -2.32106,0.33158 -14.75533,3.39869 -14.75533,3.39869 z"
+ id="path1561-3-3-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 84.779794,202.78396 c 3.81317,-1.82369 15.418476,-5.05659 15.418476,-5.05659 2.32106,2.48684 12.60004,4.72502 15.0869,4.8908 -5.30529,0.0829 -14.25795,-2.40395 -15.750063,-3.2329 -2.32106,0.33158 -14.755313,3.39869 -14.755313,3.39869 z"
+ id="path1561-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 170.12421,209.34892 c 3.81317,-1.82369 15.41849,-5.0566 15.41849,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30529,0.0829 -14.25795,-2.40396 -15.75007,-3.23291 -2.32106,0.33158 -14.75533,3.3987 -14.75533,3.3987 z"
+ id="path1561-3-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 124.16951,215.91387 c 3.81317,-1.82369 15.41849,-5.0566 15.41849,-5.0566 2.32106,2.48685 12.60005,4.72503 15.08691,4.89081 -5.30529,0.0829 -14.25796,-2.40395 -15.75008,-3.2329 -2.32106,0.33158 -14.75532,3.39869 -14.75532,3.39869 z"
+ id="path1561-6-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 134.01694,196.21901 c 3.81318,-1.82369 15.41849,-5.0566 15.41849,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30528,0.0829 -14.25796,-2.40395 -15.75007,-3.23291 -2.32106,0.33158 -14.75533,3.3987 -14.75533,3.3987 z"
+ id="path1561-6-5-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 101.19217,179.80662 c 3.81317,-1.82369 15.41848,-5.0566 15.41848,-5.0566 2.32106,2.48685 12.60005,4.72503 15.0869,4.89081 -5.30528,0.0829 -14.25795,-2.40395 -15.75006,-3.2329 -2.32106,0.33158 -14.75532,3.39869 -14.75532,3.39869 z"
+ id="path1561-62-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 179.97165,189.65405 c 3.81317,-1.82369 15.41849,-5.05659 15.41849,-5.05659 2.32106,2.48684 12.60005,4.72502 15.0869,4.8908 -5.30529,0.0829 -14.25795,-2.40395 -15.75006,-3.2329 -2.32106,0.33158 -14.75533,3.39869 -14.75533,3.39869 z"
+ id="path1561-3-3-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 143.86438,176.52414 c 3.81317,-1.82368 15.41849,-5.05659 15.41849,-5.05659 2.32107,2.48685 12.60006,4.72502 15.08691,4.8908 -5.30529,0.0829 -14.25796,-2.40395 -15.75007,-3.2329 -2.32106,0.33158 -14.75533,3.39869 -14.75533,3.39869 z"
+ id="path1561-6-5-0-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 169.24797,297.69518 c 3.81317,-1.82369 15.41848,-5.0566 15.41848,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30529,0.0829 -14.25795,-2.40395 -15.75007,-3.23291 -2.32106,0.33158 -14.75532,3.3987 -14.75532,3.3987 z"
+ id="path1561-62-6-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 51.95504,192.93653 c 3.813167,-1.82369 15.418472,-5.0566 15.418472,-5.0566 2.321063,2.48685 12.600044,4.72502 15.086892,4.89081 -5.30528,0.0829 -14.25794,-2.40395 -15.750053,-3.2329 -2.321056,0.33158 -14.755311,3.39869 -14.755311,3.39869 z"
+ id="path1561-3-2-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 61.802466,173.24167 c 3.813167,-1.82369 15.418473,-5.0566 15.418473,-5.0566 2.321063,2.48685 12.600046,4.72502 15.086891,4.8908 -5.305279,0.0829 -14.25794,-2.40395 -15.750053,-3.2329 -2.321056,0.33158 -14.755311,3.3987 -14.755311,3.3987 z"
+ id="path1561-3-3-8-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -19.58173,222.33851 c 3.813171,-1.82369 15.4184719,-5.05659 15.4184719,-5.05659 2.32106,2.48684 12.6000424,4.72502 15.0868961,4.8908 -5.3052827,0.0829 -14.2579461,-2.40395 -15.750055,-3.2329 -2.3210608,0.33158 -14.755313,3.39869 -14.755313,3.39869 z"
+ id="path1561-9-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 156.9943,227.63018 c 3.81317,-1.82369 15.41849,-5.05659 15.41849,-5.05659 2.32106,2.48684 12.60006,4.72502 15.08691,4.8908 -5.30529,0.0829 -14.25796,-2.40395 -15.75008,-3.2329 -2.32105,0.33158 -14.75532,3.39869 -14.75532,3.39869 z"
+ id="path1561-3-20-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 169.24797,297.69518 c 3.81318,-1.82369 15.41848,-5.0566 15.41848,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30529,0.0829 -14.25795,-2.40395 -15.75007,-3.23291 -2.32106,0.33158 -14.75532,3.3987 -14.75532,3.3987 z"
+ id="path1561-6-2-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 179.09541,278.00031 c 3.81317,-1.82368 15.41848,-5.05659 15.41848,-5.05659 2.32106,2.48685 12.60006,4.72502 15.0869,4.8908 -5.30528,0.0829 -14.25795,-2.40395 -15.75007,-3.2329 -2.32105,0.33158 -14.75531,3.39869 -14.75531,3.39869 z"
+ id="path1561-6-5-3-8"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -3.1693531,205.92613 c 3.81316673,-1.82369 15.4184741,-5.0566 15.4184741,-5.0566 2.321062,2.48685 12.600044,4.72502 15.086891,4.8908 -5.305277,0.0829 -14.257939,-2.40395 -15.750054,-3.2329 -2.3210567,0.33158 -14.7553111,3.3987 -14.7553111,3.3987 z"
+ id="path1561-3-2-5-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 190.55499,168.48737 c 3.81317,-1.82369 15.41849,-5.05659 15.41849,-5.05659 2.32106,2.48684 12.60005,4.72502 15.0869,4.8908 -5.30529,0.0829 -14.25795,-2.40395 -15.75006,-3.2329 -2.32106,0.33158 -14.75533,3.39869 -14.75533,3.39869 z"
+ id="path1561-3-3-6-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 190.41465,255.36182 c 3.81317,-1.82369 15.41848,-5.0566 15.41848,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30529,0.0829 -14.25795,-2.40395 -15.75007,-3.23291 -2.32106,0.33158 -14.75532,3.3987 -14.75532,3.3987 z"
+ id="path1561-62-6-3-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 190.41465,255.36182 c 3.81318,-1.82369 15.41848,-5.0566 15.41848,-5.0566 2.32107,2.48685 12.60006,4.72502 15.08691,4.89081 -5.30529,0.0829 -14.25795,-2.40395 -15.75007,-3.23291 -2.32106,0.33158 -14.75532,3.3987 -14.75532,3.3987 z"
+ id="path1561-6-2-2-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 200.26209,235.66695 c 3.81317,-1.82368 15.41848,-5.05659 15.41848,-5.05659 2.32106,2.48685 12.60006,4.72502 15.0869,4.8908 -5.30528,0.0829 -14.25795,-2.40395 -15.75007,-3.2329 -2.32105,0.33158 -14.75531,3.39869 -14.75531,3.39869 z"
+ id="path1561-6-5-3-8-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 6.8766038,185.29682 c 3.8131712,-1.82369 15.4184722,-5.05659 15.4184722,-5.05659 2.32106,2.48684 12.600044,4.72502 15.086897,4.8908 -5.305282,0.0829 -14.257947,-2.40395 -15.750056,-3.2329 -2.321061,0.33158 -14.7553132,3.39869 -14.7553132,3.39869 z"
+ id="path1561-9-9-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#77b7e2;fill-opacity:1;stroke:none;stroke-width:0.16412376px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 23.288981,168.88444 c 3.813167,-1.82369 15.418475,-5.0566 15.418475,-5.0566 2.321063,2.48685 12.600043,4.72502 15.086891,4.8908 -5.305277,0.0829 -14.257938,-2.40395 -15.750053,-3.2329 -2.321057,0.33158 -14.755313,3.3987 -14.755313,3.3987 z"
+ id="path1561-3-2-5-9-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
</g>
</svg>
diff --git a/src/activities/colors/resource/black_duck.svg b/src/activities/colors/resource/black_duck.svg
index fa9dcdb7c..1733909db 100644
--- a/src/activities/colors/resource/black_duck.svg
+++ b/src/activities/colors/resource/black_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="black_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="65.601816"
- inkscape:cy="34.71256"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#000000;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#070707;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702000000005;fill:#fbc7c7;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#2a2a2a;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#505050;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/blue_duck.svg b/src/activities/colors/resource/blue_duck.svg
index b406efabd..295f0a2bd 100644
--- a/src/activities/colors/resource/blue_duck.svg
+++ b/src/activities/colors/resource/blue_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="blue_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="65.601816"
- inkscape:cy="34.71256"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#006ee5;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#288fff;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702000000005;fill:#006ee5;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#a3cfff;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#004da0;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#006ee5;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#004da0;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#006ee5;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/brown_duck.svg b/src/activities/colors/resource/brown_duck.svg
index a26441c41..01a718637 100644
--- a/src/activities/colors/resource/brown_duck.svg
+++ b/src/activities/colors/resource/brown_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="brown_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="47.583985"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#72462a;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#824c29;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#f03636;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#974a18;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#4a2d1b;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#72462a;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#4a2d1b;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#72462a;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/checkError.svg b/src/activities/colors/resource/checkError.svg
index d5adf6cee..339ab6657 100644
--- a/src/activities/colors/resource/checkError.svg
+++ b/src/activities/colors/resource/checkError.svg
@@ -1,101 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2862"
sodipodi:docname="checkError.svg"
viewBox="0 0 128.5 128.5"
sodipodi:version="0.32"
version="1.0"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
width="100%"
height="100%">
<defs
id="defs8" />
<sodipodi:namedview
id="base"
bordercolor="#666666"
inkscape:grid-points="true"
inkscape:pageshadow="2"
guidetolerance="10"
pagecolor="#ffffff"
gridtolerance="10000"
- inkscape:window-height="706"
- inkscape:zoom="1.979899"
+ inkscape:window-height="1051"
+ inkscape:zoom="3.959798"
objecttolerance="10"
showgrid="true"
borderopacity="1.0"
inkscape:current-layer="layer1"
- inkscape:cx="20.561595"
- inkscape:cy="78.176221"
+ inkscape:cx="20.814134"
+ inkscape:cy="58.983323"
inkscape:window-y="0"
inkscape:window-x="0"
- inkscape:window-width="1200"
+ inkscape:window-width="1884"
inkscape:pageopacity="0.0"
inkscape:document-units="px"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
borderlayer="true"
- inkscape:window-maximized="0" />
+ inkscape:window-maximized="1" />
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer"
transform="translate(-83.25,-505.625)">
<path
id="path2892"
- style="fill:#ff0000;fill-rule:evenodd;stroke:#000000;stroke-width:1.26732671px"
- d="m 115.81683,506.50866 31.68317,31.68317 31.68317,-31.68317 31.68317,31.68317 -31.68317,31.68317 31.68317,31.68317 -31.68317,31.68317 L 147.5,601.55817 115.81683,633.24134 84.133663,601.55817 115.81683,569.875 84.133663,538.19183 115.81683,506.50866 z"
+ style="fill:#9e0e0e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.26732671px"
+ d="m 115.81683,506.50866 31.68317,31.68317 31.68317,-31.68317 31.68317,31.68317 -31.68317,31.68317 31.68317,31.68317 -31.68317,31.68317 L 147.5,601.55817 115.81683,633.24134 84.13366,601.55817 115.81683,569.875 84.13366,538.19183 Z"
inkscape:connector-curvature="0" />
+ <path
+ id="path2892-3"
+ style="fill:#df2020;fill-rule:evenodd;stroke:none;stroke-width:1.26732671px;fill-opacity:1"
+ d="m 115.81683,510.50866 31.68317,31.68317 31.68317,-31.68317 25.68317,25.68317 -31.68317,31.68317 31.68317,31.68317 -25.68317,25.68317 L 147.5,595.55817 115.81683,625.24134 90.13366,599.55817 121.81683,567.875 90.13366,536.19183 Z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccc" />
</g>
<metadata
id="metadata6">
<rdf:RDF>
<cc:Work>
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
<dc:publisher>
<cc:Agent
rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
+ <dc:title />
</cc:Agent>
</dc:publisher>
- <dc:title>Error</dc:title>
- <dc:date>2012-08-01T19:43:20</dc:date>
+ <dc:title />
+ <dc:date>2019</dc:date>
<dc:description />
- <dc:source>https://openclipart.org/detail/171390/error-by-lpenz-171390</dc:source>
+ <dc:source />
<dc:creator>
<cc:Agent>
- <dc:title>lpenz</dc:title>
+ <dc:title>Timothée Giet</dc:title>
</cc:Agent>
</dc:creator>
<dc:subject>
- <rdf:Bag>
- <rdf:li>wrong error fail x check</rdf:li>
- </rdf:Bag>
+ <rdf:Bag />
</dc:subject>
</cc:Work>
<cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
</svg>
diff --git a/src/activities/colors/resource/green_duck.svg b/src/activities/colors/resource/green_duck.svg
index 1c2c3b9cc..5b029a0c8 100644
--- a/src/activities/colors/resource/green_duck.svg
+++ b/src/activities/colors/resource/green_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="green_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="47.583985"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#00bd00;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#3dab3d;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#f03636;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#37d537;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ style="fill:#007400;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ id="path3451-5" />
+ <path
+ style="fill:#00bd00;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ id="path3451" />
+ <path
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ id="path3472" />
+ <path
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ id="path3472-3" />
+ <path
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ id="path3477" />
+ <path
+ style="fill:#007400;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ id="path2998" />
+ <path
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ id="path860-6" />
+ <path
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ id="path860" />
+ <ellipse
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path863"
+ cx="-74.217613"
+ cy="265.14505"
+ rx="0.30903038"
+ ry="0.53453904"
+ transform="rotate(-19.697772)" />
+ <ellipse
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path865"
+ cx="19.279617"
+ cy="274.60309"
+ rx="0.20880431"
+ ry="0.21715648" />
+ <ellipse
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path865-3"
+ cx="19.546465"
+ cy="274.95673"
+ rx="0.10410537"
+ ry="0.10309207" />
+ <path
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ id="path3477-7" />
+ <path
+ style="fill:#00bd00;fill-opacity:1;stroke:none;stroke-width:0.25017193"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ id="path2998-6" />
</g>
</svg>
diff --git a/src/activities/colors/resource/grey_duck.svg b/src/activities/colors/resource/grey_duck.svg
index 0a1a55708..c028ef7d7 100644
--- a/src/activities/colors/resource/grey_duck.svg
+++ b/src/activities/colors/resource/grey_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="grey_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="45.058604"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#565656;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#514848;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702000000005;fill:#f9adad;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#7b6f6f;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#373737;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#565656;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#373737;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#565656;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/orange_duck.svg b/src/activities/colors/resource/orange_duck.svg
index 75d5170fb..467a15e53 100644
--- a/src/activities/colors/resource/orange_duck.svg
+++ b/src/activities/colors/resource/orange_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="orange_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="45.058604"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="200"
- inkscape:window-y="195"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#ff7f00;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f19614;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#f03636;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#fcb34c;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#9e4f00;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#ff7f00;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#9e4f00;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#ff7f00;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/pink_duck.svg b/src/activities/colors/resource/pink_duck.svg
index 03a8826d3..4be5e9b02 100644
--- a/src/activities/colors/resource/pink_duck.svg
+++ b/src/activities/colors/resource/pink_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="pink_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="7.919596"
- inkscape:cx="49.125073"
- inkscape:cy="49.171041"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1855"
- inkscape:window-height="1181"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#ffb3fd;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff92fb;fill-opacity:1;stroke:none"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4006c;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#ffd3fb;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffaaf3;stroke:none;filter:url(#filter4695);fill-opacity:1"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#eee5e5;stroke:none;filter:url(#filter4691);fill-opacity:1"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d40091;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#c27ea1;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#ba34b6;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#ffb3fd;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#ba34b6;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#ffb3fd;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/purple_duck.svg b/src/activities/colors/resource/purple_duck.svg
index 89563dd74..b6b54e235 100644
--- a/src/activities/colors/resource/purple_duck.svg
+++ b/src/activities/colors/resource/purple_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="purple_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="47.583985"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#8902bb;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#7b13a2;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#f03636;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#b644e0;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#51076d;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#8902bb;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#51076d;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#8902bb;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/red_duck.svg b/src/activities/colors/resource/red_duck.svg
index 93ec3589f..c183386aa 100644
--- a/src/activities/colors/resource/red_duck.svg
+++ b/src/activities/colors/resource/red_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="red_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="47.583985"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#c90000;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#d20d0d;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#f03636;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#f76363;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#6c0d0d;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#c90000;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#6c0d0d;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#c90000;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/white_duck.svg b/src/activities/colors/resource/white_duck.svg
index 07790b069..b902c2083 100644
--- a/src/activities/colors/resource/white_duck.svg
+++ b/src/activities/colors/resource/white_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="white_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="47.583985"
- inkscape:cy="34.887679"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="887"
- inkscape:window-height="654"
- inkscape:window-x="683"
- inkscape:window-y="257"
- inkscape:window-maximized="0" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#ffffff;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f5f5f5;stroke:none;fill-opacity:1"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702000000005;fill:#140202;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#a0a0a0;stroke:none;filter:url(#filter4475);fill-opacity:1"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#727272;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#727272;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/colors/resource/yellow_duck.svg b/src/activities/colors/resource/yellow_duck.svg
index 1275700b0..1adbd4fed 100644
--- a/src/activities/colors/resource/yellow_duck.svg
+++ b/src/activities/colors/resource/yellow_duck.svg
@@ -1,347 +1,93 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="99.900558"
- height="101.53598"
- id="svg2"
+ id="svg833"
version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="yellow_duck.svg">
+ viewBox="0 0 26.458333 26.458334"
+ height="100"
+ width="100">
<defs
- id="defs4">
- <filter
- color-interpolation-filters="sRGB"
- height="1.3074958"
- y="-0.1537479"
- width="1.1968017"
- x="-0.098400861"
- id="filter4839"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4841"
- stdDeviation="4.9559183"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.6882099"
- y="-0.34410495"
- width="1.111562"
- x="-0.055781025"
- id="filter4770"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4772"
- stdDeviation="7.0859333"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5802039"
- y="-0.29010195"
- width="1.1150333"
- x="-0.057516653"
- id="filter4729"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4731"
- stdDeviation="2.4014337"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.1740189"
- y="-0.58700943"
- width="1.3395016"
- x="-0.16975078"
- id="filter4695"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4697"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.7123587"
- y="-0.85617936"
- width="1.257376"
- x="-0.12868796"
- id="filter4691"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4693"
- stdDeviation="2.4925109"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.2846919"
- y="-0.14234596"
- width="1.2110481"
- x="-0.10552406"
- id="filter4647"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4649"
- stdDeviation="3.3662368"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4427272"
- y="-0.2213636"
- width="1.3390284"
- x="-0.16951416"
- id="filter4603"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4605"
- stdDeviation="4.6525483"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="2.2803988"
- y="-0.64019942"
- width="2.0179296"
- x="-0.50896478"
- id="filter4587"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4589"
- stdDeviation="14.067819"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.7961402"
- y="-0.3980701"
- width="1.2742807"
- x="-0.13714033"
- id="filter4475"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4477"
- stdDeviation="10.448787"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5984082"
- y="-0.29920411"
- width="1.233575"
- x="-0.11678748"
- id="filter4405"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4407"
- stdDeviation="1.7588669"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.5759985"
- y="-0.28799933"
- width="1.1920002"
- x="-0.096000075"
- id="filter4327"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4329"
- stdDeviation="1.9401896"
- inkscape:collect="always" />
- </filter>
- <filter
- color-interpolation-filters="sRGB"
- height="1.4817843"
- y="-0.24089213"
- width="1.1392052"
- x="-0.069602586"
- id="filter4269"
- inkscape:collect="always">
- <feGaussianBlur
- id="feGaussianBlur4271"
- stdDeviation="1.424123"
- inkscape:collect="always" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="38.048855"
- inkscape:cy="14.684628"
- inkscape:document-units="px"
- inkscape:current-layer="g4843"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1680"
- inkscape:window-height="973"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1" />
+ id="defs827" />
<metadata
- id="metadata7">
+ id="metadata830">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-169.58212,-323.5515)">
- <g
- transform="translate(18.672142,94.713698)"
- inkscape:label="Kumiankka"
- id="layer2">
- <g
- id="g4843">
- <path
- style="fill:#ffff00;stroke:none;fill-opacity:1"
- d="m 158.61032,270.03622 c 2.54817,-0.43681 6.13994,4.11378 7.12233,5.64877 0.9824,1.53498 4.42076,6.20134 7.55213,5.95574 1.77619,-0.1393 6.74987,-1.5714 9.88532,-1.90338 5.21895,-0.55259 10.0695,-0.0614 11.35889,-1.96479 1.28939,-1.90338 1.65779,-1.59638 -2.76298,-6.50834 -4.42076,-4.91195 -5.70718,-10.4379 -5.71015,-13.32367 -0.0103,-10.11391 4.05546,-16.89855 9.08711,-20.20043 8.21677,-5.39197 14.24468,-6.26273 16.82346,-6.75393 2.57878,-0.4912 5.03476,-0.2456 6.44695,1.28938 1.41219,1.535 1.59639,2.51739 2.14897,3.31558 0.55261,0.79819 3.49977,2.21039 5.71014,5.52595 2.2104,3.31556 2.64018,6.20133 4.48216,6.99952 3.76691,1.22217 11.58326,0.074 7.0456,8.90294 0,0.79818 6.1553,2.14898 7.38329,2.82437 1.22798,0.67538 1.96477,1.47358 1.04378,2.33317 -0.921,0.85961 -3.13136,1.10519 -4.66636,1.65779 -1.53499,0.55259 -5.15754,1.90339 -6.81534,2.64018 -1.65777,0.73679 -5.28035,1.28939 -5.46455,4.66635 -0.18419,3.37698 1.4122,3.99096 2.51739,4.97336 1.10518,0.9824 1.10518,0.9824 1.10518,0.9824 0,0 8.22753,7.36794 11.54311,10.92909 3.31556,3.56118 6.75394,10.25372 5.83294,18.17425 -0.63892,5.49472 -2.57877,7.67492 -5.34176,11.48169 -2.76297,3.80676 -5.40314,5.40315 -8.16611,6.81534 -2.76299,1.41219 -13.93769,2.76297 -25.05098,2.57877 -11.1133,-0.1842 -31.86633,-3.56116 -35.73449,-4.54355 -3.86816,-0.9824 -7.61352,-2.33319 -8.16612,-3.56117 -0.5526,-1.22801 -0.98239,-1.22801 -3.43838,-3.25418 -2.45598,-2.02617 -7.06092,-5.95574 -9.14851,-10.7449 -2.08757,-4.78916 -4.72774,-10.06951 -3.74536,-16.70064 0.98239,-6.63115 2.33109,-10.49349 2.94717,-12.21849 0.61398,-1.71919 2.39532,-5.71204 4.17517,-6.01717 z"
- id="path3451"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssssssssssccsssssscssssssssssss" />
- <path
- style="fill:#d45500;fill-opacity:1;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 0.26717,0.93512 3.4412,4.81409 7.20271,7.29388 1.42786,-0.54971 2.8819,-1.09523 3.72291,-1.398 1.53498,-0.55259 3.75166,-0.79672 4.67266,-1.65631 0.92099,-0.8596 0.17949,-1.65713 -1.0485,-2.33254 -1.22799,-0.67539 -5.69199,-1.93994 -5.14151,-2.51794 0.307,-0.32235 0.98824,-0.4905 3.66754,-3.37794 2.51865,-2.71431 2.39535,-3.56374 2.94794,-5.03734 0.55259,-1.47358 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3472"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscscsssssscc" />
- <path
- style="fill:#ff6600;stroke:none"
- d="m 245.30325,245.78233 c -1.026,0.0547 -3.25446,0.93172 -6.01745,1.96784 -1.91572,0.71839 -4.1616,0.98681 -6.00986,0.87374 -2.60808,5.16061 -2.93178,8.30777 -2.64403,9.3149 1.9787,1.73733 8.61924,0.78984 10.73032,-1.66916 0.55596,-0.61616 1.43675,-1.30931 2.34549,-2.31969 2.42808,-2.69971 2.65583,-3.88936 2.94794,-5.03734 0.38809,-1.52518 -0.24148,-3.06888 -1.16246,-3.13029 -0.0575,-0.004 -0.12155,-0.004 -0.18995,0 z"
- id="path3477"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscccsscc" />
- <path
- style="fill:#ffffff;stroke:#000000;stroke-width:0.2431294px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 220.80795,239.09093 c 1.7182,-0.14291 2.08758,-0.10853 3.49977,1.47356 1.48155,1.6598 4.05237,6.07857 4.05237,6.99956 0,0.92097 -0.1842,1.96476 -1.84198,0.79818 -1.65779,-1.16658 -4.42077,-4.66636 -5.89435,-5.95575 -1.4736,-1.28938 -0.94074,-3.22202 0.18419,-3.31555 z"
- id="path3482"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ssssss" />
- <path
- style="fill:#000000;stroke:none"
- d="m 224.30772,243.08188 c 0.5526,-0.5526 1.04379,-0.307 1.78057,0.79819 0.73681,1.10518 1.535,2.33319 1.535,3.06998 0,0.73678 -0.92099,0.42979 -1.28939,0.0614 -0.36838,-0.3684 -1.90339,-2.51739 -2.08759,-2.88577 -0.18419,-0.36841 -0.12279,-0.73681 0.0614,-1.0438 z"
- id="path3484"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffcc00;stroke:none"
- d="m 219.76416,315.96303 c -3.86817,5.28036 -9.14852,7.49073 -15.71825,7.67492 -6.56974,0.18419 -18.88708,-3.39569 -22.5336,-5.21894 -3.80676,-1.9034 -5.89435,-4.23657 -6.75394,-6.07855 -0.8596,-1.84198 -1.04379,-5.52595 -1.04379,-5.52595 0,0 -4.17515,-3.99097 -4.29797,-7.24514 -0.1228,-3.25417 0.30701,-6.93813 1.65779,-8.10473 1.35079,-1.16658 7.92052,-0.24559 9.63971,0.2456 1.71919,0.4912 1.4122,0.36839 3.43837,1.28939 -0.36838,-1.90338 -1.16658,-3.00856 1.16659,-3.92957 2.33319,-0.92099 8.28893,-0.67539 11.8501,-0.18419 3.56116,0.4912 18.17686,5.88153 22.28799,8.35032 4.53914,2.72583 2.56732,17.2527 0.307,18.72684 z"
- id="path2998"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscssscsssc" />
- <path
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4603)"
- d="m 292.18662,565.21612 c -41.66879,-11.36421 -48.73986,-16.41498 -52.27539,-20.20305 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 5.05076,17.42513 22.47589,23.48605 17.42513,6.06091 32.32488,8.5863 35.60788,12.62691 3.28299,4.04061 0.75761,6.06091 0.75761,6.06091 z"
- id="path3000"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="opacity:0.52789702;fill:#f03636;fill-opacity:1;stroke:none;filter:url(#filter4587)"
- d="m 392.19172,510.1628 c 17.42513,4.54569 25.50636,14.14214 26.76905,24.49621 1.26269,10.35406 -16.16245,24.24366 -29.29443,27.27412 -13.13198,3.03045 -26.26396,-3.78808 -31.8198,-14.39468 -5.55584,-10.6066 -8.08122,-24.24366 0,-31.8198 8.08122,-7.57615 34.34518,-5.55585 34.34518,-5.55585 z"
- id="path3806"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4695)"
- d="m 249.25514,488.9496 c 19.44544,4.79823 26.26396,8.83884 31.56727,6.81853 5.3033,-2.0203 -6.566,-6.56599 -6.566,-6.56599 0,0 -9.60039,-2.79448 -16.66751,-3.03045 -16.3543,-0.54607 -9.2258,2.72544 -8.33376,2.77791 z"
- id="path4036"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffeeaa;stroke:none;filter:url(#filter4691)"
- d="m 313.14729,479.35316 c 5.93464,0.25254 22.72843,1.64149 26.76904,1.13642 4.04061,-0.50508 -9.72272,-3.40926 -21.08694,-4.16688 -11.36422,-0.75761 -19.31916,-1.2627 -25.12754,1.76776 -4.19626,2.18935 -12.63469,7.49666 -11.27674,14.84968 3.65844,-3.20393 9.08945,-8.78876 13.80212,-10.55653 5.67481,-2.12868 12.75318,-3.03045 16.92006,-3.03045 z"
- id="path4038"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- inkscape:connector-curvature="0"
- id="path4168"
- d="m 321.98612,609.91537 c -41.66879,-11.36421 -60.35661,-22.72843 -63.89214,-26.5165 -3.53554,-3.78807 -13.38452,-19.44544 -12.62691,-26.76904 0.75762,-7.32361 2.52538,-1.76777 6.06092,4.79822 3.53553,6.56599 1.59958,10.39163 16.16244,21.71828 6.81852,5.3033 16.92005,10.10153 26.01143,12.62691 5.01627,1.39341 28.28426,14.14213 28.28426,14.14213 z"
- style="fill:#d4aa00;fill-opacity:1;stroke:none;filter:url(#filter4647)"
- sodipodi:nodetypes="csssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4269)"
- d="m 536.96428,300.30861 c -8.193,0.87228 -16.03971,5.70826 -22.96776,8.11445 -5.25143,1.25829 -10.45145,2.80934 -15.79786,3.62288 -2.7481,0.25477 -5.47584,-0.96536 -8.20512,-0.51924 -0.18298,1.78507 2.65247,2.54945 4.15084,2.82783 4.65481,0.6501 9.16284,-1.12775 13.56116,-2.40188 6.85289,-2.19 13.60255,-4.71047 20.16203,-7.66814 2.79088,-1.05928 5.61364,-2.43361 8.65028,-2.45804 0.95428,0.42688 3.93333,-0.37718 1.8478,-1.24442 -0.44326,-0.17227 -0.92151,-0.30202 -1.40137,-0.27344 z"
- id="path4230"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4327)"
- d="m 480.08928,347.80861 c 5.53572,1.69643 13.15061,3.17091 18.39286,2.58929 6.74025,-0.74782 16.63596,-5.46565 21.69643,-8.83928 1.875,-1.25 16.875,-13.48215 12.14285,-8.12501 -12.50929,12.19037 -17.44358,15.11705 -29.91071,18.30358 -5.625,1.07143 -11.40749,1.35369 -16.78571,0.17857 -7.72173,-1.68716 -7.59235,-3.57144 -5.53572,-4.10715 z"
- id="path4273"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssccsc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:none;filter:url(#filter4405)"
- d="m 542.94643,362.36219 c -0.98215,3.125 -9.30392,4.54305 -18.57143,6.96429 -9.91072,2.58928 -12.41072,4.73213 -17.32143,6.16071 -0.26786,1.60714 0.71428,1.60714 1.69643,1.33928 0.98214,-0.26786 13.83929,-5.35714 16.51786,-6.16071 2.67857,-0.80358 11.0786,-2.77228 13.30357,-3.66072 5.41363,-2.16168 6.7911,-5.44822 4.375,-4.64285 z"
- id="path4331"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cscsssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#d4aa00;stroke:none;filter:url(#filter4475)"
- d="m 506.78571,377.71933 c -21.05348,5.16588 -38.48169,7.85714 -42.05311,15 -3.57143,7.14286 0.77555,14.16317 -7.2326,17.14286 -17.37985,6.46674 -43.57143,17.5 -63.21429,19.28571 -19.64286,1.78572 -42.14286,3.21429 -49.64286,-1.07143 -7.5,-4.28571 -20.71428,-21.07143 -20.71428,-25 0,-3.92857 20.18854,-6.44019 42.49999,0.35715 29.70323,9.04929 59.02206,-4.09876 76.07144,-12.14286 17.16449,-8.09842 25.71429,-17.85714 35.71429,-20.71428 10,-2.85715 21.07142,-3.92857 24.28571,-0.71429 3.21428,3.21429 4.28571,7.85714 4.28571,7.85714 z"
- id="path4409"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssssssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4729)"
- d="m 325.39539,436.92675 c -7.57615,2.65165 -19.69798,3.28299 -26.89532,3.6618 -7.19733,0.37881 -19.95051,1.01015 -31.18845,3.53553 -11.23795,2.52538 -17.93021,3.91434 -22.98098,4.9245 -5.05076,1.01015 -5.3033,1.01015 -5.3033,1.01015 0,0 -9.34391,-2.39911 -4.16688,0 5.17704,2.39911 18.94036,-0.50508 23.86486,-1.01015 4.92449,-0.50508 19.95051,-5.3033 34.09265,-5.55584 14.14213,-0.25254 26.67396,-1.60622 29.29442,-2.14658 6.64281,-1.3698 11.2199,-8.62345 11.38586,-9.98798 0.18631,-1.53194 -5.9238,5.10202 -8.10286,5.56857 z"
- id="path4699"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cssscsssssc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#000000;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4770)"
- d="m 204.375,579.53125 c 7.21079,5.93481 15.70959,11.00508 20.6875,19.15625 8.55428,6.76014 19.98047,8.41851 30.19162,11.54219 33.89049,7.64947 68.65864,11.61778 103.13496,15.77828 43.70585,4.56203 88.2392,4.1712 131.48592,-3.63297 6.80506,-1.49365 13.48155,-3.64501 19.375,-7.4375 -18.75973,5.44033 -37.97313,9.14557 -57.5625,9.28125 -31.28632,0.89508 -62.58622,-1.09706 -93.8387,-1.94408 -41.15432,-4.00692 -81.95768,-13.19546 -120.69255,-27.33717 -10.98527,-4.68752 -21.57646,-12.83165 -32.78125,-15.40625 z"
- id="path4733"
- inkscape:connector-curvature="0"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- <path
- style="fill:#ffffff;stroke:none;filter:url(#filter4839)"
- d="m 408.60977,240.75 c -30.6863,3.3322 -59.16623,15.71297 -82.92227,35.59375 -11.54301,11.20229 -19.09941,26.24921 -22.8125,41.75 8.74726,-17.3566 23.46483,-30.8024 37.19746,-44.22984 13.45975,-8.28755 23.54507,-16.12728 36.95989,-20.37167 15.52407,-5.14887 30.40142,-8.66102 46.71765,-9.42974 -3.89487,-2.85786 -10.40741,-3.44848 -15.14023,-3.3125 z"
- id="path4774"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccc"
- transform="matrix(0.24312941,0,0,0.24312941,114.21851,173.2006)" />
- </g>
- <path
- inkscape:connector-curvature="0"
- id="path3863"
- d="m 214.319,230.76005 c -0.75376,-0.008 -1.54943,0.0745 -2.3553,0.22793 -2.5788,0.49121 -8.60477,1.36247 -16.82152,6.75445 -5.03167,3.30186 -9.09737,10.08103 -9.08696,20.19493 0.003,2.88577 1.29276,8.41457 5.71353,13.32654 4.42077,4.91195 4.04739,4.60792 2.758,6.5113 -1.28938,1.90338 -6.13975,1.40764 -11.3587,1.96023 -3.13544,0.33199 -8.10855,1.76774 -9.88473,1.90706 -3.13137,0.24559 -6.56982,-4.4217 -7.55221,-5.95667 -0.98239,-1.53499 -4.57096,-6.0896 -7.11913,-5.65277 -1.77984,0.30513 -3.5648,4.29828 -4.17879,6.01745 -0.61609,1.72502 -1.96555,5.59372 -2.94794,12.22485 -0.98238,6.63114 1.65813,11.91081 3.74572,16.69996 2.08757,4.78915 6.69175,8.7171 9.14773,10.74328 2.45598,2.02618 2.8892,2.02386 3.44181,3.25186 0.55259,1.22798 4.29946,2.58096 8.16763,3.56336 3.86816,0.98239 24.61912,4.35927 35.73242,4.54348 11.11331,0.18419 22.28694,-1.17107 25.04992,-2.58325 2.76299,-1.4122 5.40466,-3.00845 8.16764,-6.81522 2.76297,-3.80676 4.70233,-5.98554 5.34125,-11.48027 0.92099,-7.92053 -2.51954,-14.61275 -5.83511,-18.17392 C 241.12868,284.46346 232.9032,277.099 232.9032,277.099 l -1.10167,-0.98772 c -1.10519,-0.98238 -2.70666,-1.59199 -2.52247,-4.96895 0.1842,-3.37697 3.80503,-3.92826 5.46282,-4.66504 0.74948,-0.33311 1.9141,-0.79244 3.0923,-1.24604 0.78648,-0.3028 1.55338,-0.59058 2.24895,-0.85095 0.57876,-0.21489 1.09078,-0.40908 1.47397,-0.54705 0.19187,-0.0692 0.3985,-0.12871 0.60783,-0.18994 0.20686,-0.0607 0.42191,-0.12587 0.63821,-0.18235 0.43805,-0.11402 0.89143,-0.22312 1.32202,-0.3419 0.85959,-0.23793 1.64409,-0.51233 2.10458,-0.94212 0.0575,-0.0537 0.10706,-0.10634 0.15196,-0.15956 0.0897,-0.10646 0.15518,-0.21483 0.19754,-0.31911 0.10546,-0.25858 0.0679,-0.50943 -0.0684,-0.75219 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.0548,-0.0963 -0.12767,-0.18775 -0.21274,-0.28112 -0.002,-0.002 0.002,-0.007 0,-0.008 -0.175,-0.19094 -0.4098,-0.36973 -0.6838,-0.54704 -0.13601,-0.0882 -0.27959,-0.17391 -0.43307,-0.25833 -0.0726,-0.0399 -0.16121,-0.0849 -0.26594,-0.12917 -0.005,-0.003 -0.0103,-0.006 -0.0152,-0.008 -0.005,-0.002 -0.0105,-0.007 -0.0151,-0.008 -1.52057,-0.69874 -5.36021,-1.83207 -4.8474,-2.37051 0.40218,-0.23528 0.75966,-0.49968 1.0561,-0.78257 0.73592,-0.57131 1.53927,-1.299 2.54527,-2.27935 0.33758,-0.38219 0.25631,-0.39146 -0.0304,-0.21274 0.0329,-0.0359 0.0658,-0.0697 0.0988,-0.10637 1.15493,-1.24466 1.7484,-2.0956 2.11219,-2.79599 0.029,-0.0513 0.0493,-0.10225 0.076,-0.15196 0.007,-0.0127 0.0168,-0.0255 0.0227,-0.0379 0.44259,-0.83452 0.58408,-1.45042 0.73699,-2.05141 0.45092,-1.20242 0.004,-2.48295 -0.6762,-2.94795 -0.0492,-0.0352 -0.0996,-0.0656 -0.15195,-0.0912 -0.0567,-0.0272 -0.10843,-0.0452 -0.16716,-0.0608 -0.0551,-0.0151 -0.10958,-0.0265 -0.16715,-0.0303 -0.0575,-0.004 -0.12154,-0.004 -0.18994,0 -1.026,0.0547 -3.25448,0.9317 -6.01744,1.96782 -1.91573,0.71839 -4.16163,0.98682 -6.00987,0.87374 -0.006,0.0103 -0.01,0.02 -0.0153,0.0303 -0.90749,-0.14757 -1.7827,-0.30436 -2.50727,-0.53944 -1.84198,-0.79824 -2.27231,-3.68205 -4.48269,-6.99763 -2.21038,-3.31557 -5.15334,-4.7254 -5.70595,-5.52359 -0.55258,-0.79819 -0.73798,-1.78524 -2.15017,-3.32023 -0.97087,-1.0553 -2.43689,-1.49597 -4.09522,-1.51197 z"
- style="fill:none;stroke:#000000;stroke-width:0.7293883" />
- </g>
+ transform="translate(0,-270.54165)"
+ id="layer1">
+ <path
+ id="path3451-5"
+ d="m 2.0298107,281.24868 c 0.6742033,-0.11557 1.6245257,1.08844 1.8844498,1.49457 0.2599266,0.40613 1.1696594,1.64077 1.9981677,1.57579 0.4699503,-0.0369 1.7859031,-0.41576 2.6154909,-0.5036 1.3808472,-0.14621 2.6642219,-0.0163 3.0053729,-0.51985 0.341151,-0.5036 0.438624,-0.42238 -0.731038,-1.722 -1.1696598,-1.29962 -1.5100251,-2.76169 -1.5108109,-3.52522 -0.00273,-2.67597 1.0730069,-4.47108 2.4042979,-5.3447 2.174021,-1.42662 3.768905,-1.65701 4.451207,-1.78698 0.682303,-0.12996 1.332114,-0.065 1.705756,0.34115 0.373642,0.40614 0.422378,0.66606 0.568581,0.87725 0.146212,0.21119 0.925981,0.58483 1.510808,1.46207 0.584835,0.87725 0.698548,1.64077 1.185905,1.85196 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.54606 1.17126,4.381 -0.438619,0.19495 -2.207252,0.66689 -2.255989,1.56038 0.378916,1.84885 2.849775,3.02812 4.012587,4.46745 2.765728,3.42341 1.762715,8.41537 -2.030659,9.64969 -4.1026,1.33494 -15.8275471,1.84091 -18.2434417,-1.46207 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.5361 -1.8682017,-1.57579 -2.4205432,-2.84293 -1.23389761,-3.05602 -1.33368257,-4.49459 -0.21118778,-7.65152 0.16244888,-0.45486 0.63376178,-1.51131 1.10468038,-1.59204 z"
+ style="fill:#8c8c12;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3451"
+ d="m 2.0298107,281.77785 c 0.6742033,-0.11557 1.0953591,0.55927 1.3552831,0.9654 0.2599267,0.40613 1.6988261,2.16994 2.5273344,2.10496 0.4699503,-0.0369 1.7859031,-0.41577 2.6154909,-0.5036 1.3808472,-0.14621 2.9929379,-0.28352 3.3340889,-0.78712 0.341151,-0.50361 0.639075,-0.68428 -0.530587,-1.9839 -1.16966,-1.29962 -1.5100254,-2.76169 -1.5108112,-3.52522 -0.00273,-2.67597 1.0730072,-4.47108 2.4042982,-5.3447 2.17402,-1.42662 3.273147,-1.3283 3.955449,-1.45826 0.682302,-0.12996 1.298705,0.13547 1.672347,0.5416 0.373642,0.40613 0.422378,0.66606 0.568581,0.87725 0.146212,0.21118 0.792346,0.28952 1.377173,1.16676 0.584835,0.87725 0.832183,1.60736 1.31954,1.81855 0.295079,0.13962 0.392041,0.0697 0.694844,0.1506 -0.05067,0.71607 1.110546,3.14515 1.17126,3.9801 -0.438619,0.19495 -2.777575,0.91459 -2.826311,1.80808 0.378915,1.84884 2.654694,2.98087 3.817506,4.4202 2.765729,3.42341 1.998951,7.88621 -1.794423,9.12053 -4.1026,1.33493 -14.8974755,1.84091 -17.3133701,-1.46208 -0.1462087,-0.32491 -0.259924,-0.32491 -0.909738,-0.861 -0.6498114,-0.53609 -1.7399396,-1.04662 -2.2922811,-2.31376 -1.23389764,-3.05602 -1.3336826,-4.49459 -0.2111878,-7.65152 0.1624489,-0.45486 0.1045951,-0.98214 0.5755137,-1.06287 z"
+ style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472"
+ d="m 21.066079,277.73851 c -0.004,0.0646 -0.0034,0.11982 -5.29e-4,0.16898 -0.0035,-0.0481 -0.0026,-0.10592 5.29e-4,-0.16898 z m -5.29e-4,0.16898 c 0.0033,0.0564 0.0099,0.10466 0.02015,0.14056 0.0092,0.28282 0.05024,1.76855 1.90531,1.9296 0.955407,-0.33176 1.487844,-0.54512 2.3385,-0.84163 0.246079,-0.93604 -1.410691,-0.79401 -1.87097,-1.29051 -1.015238,-0.21562 -2.08401,-0.19761 -2.371806,0.19324 -0.01007,-0.0346 -0.01738,-0.0784 -0.02119,-0.13126 z"
+ style="fill:#9b4a15;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path3472-3"
+ d="m 21.065717,277.73755 c -0.0034,0.0626 -0.003,0.11608 -5.3e-4,0.16371 -0.003,-0.0466 -0.0024,-0.10262 5.3e-4,-0.16371 z m -5.3e-4,0.16371 c 0.0029,0.0546 0.0087,0.10138 0.0176,0.13617 0.008,0.27399 0.04388,1.71333 1.664055,1.86935 0.834429,-0.32141 1.571122,-0.5281 2.314067,-0.81535 0.0968,-0.81233 -1.503739,-0.76922 -1.905736,-1.25022 -0.886687,-0.20889 -1.820127,-0.19144 -2.071481,0.18721 -0.0088,-0.0335 -0.01519,-0.0759 -0.01852,-0.12716 z"
+ style="fill:#c96421;fill-opacity:1;stroke:none;stroke-width:0.24337488" />
+ <path
+ id="path3477"
+ d="m 23.375198,275.35216 c -0.506867,0.19008 -1.10109,0.2611 -1.590109,0.23118 -0.690054,1.36541 -0.7757,2.1981 -0.699566,2.46457 1.745139,0.73823 3.811458,-0.70291 4.239617,-2.38818 0.102683,-0.40354 -0.06389,-0.81198 -0.307567,-0.82822 -0.623075,0.10578 -1.16972,0.34323 -1.642375,0.52065 z"
+ style="fill:#a75017;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path2998"
+ d="m 14.051311,295.43081 c -1.738244,0.0487 -4.9972071,-0.89845 -5.9620155,-1.38085 -1.3668004,-0.68688 -1.9536754,-1.60106 -2.0631494,-3.07036 -0.8459152,-0.98472 -1.789004,-3.01822 -0.6985476,-4.06132 1.1288501,-0.37429 2.7824324,0.098 3.460242,0.40614 -0.097467,-0.50361 -0.3086576,-0.79602 0.3086603,-1.0397 3.0255082,-0.56644 6.3913912,-0.32255 9.0323702,2.16062 2.640978,2.48317 -0.928823,6.85853 -4.07756,6.98547 z"
+ style="fill:#8c8c12;fill-opacity:1;stroke:none;stroke-width:0.26458332" />
+ <path
+ id="path860-6"
+ d="m 19.745729,274.20917 c 0.213759,0.60557 0.165359,1.06375 -0.02821,1.37706 -0.219837,0.35582 -0.627724,-0.0648 -0.990833,-0.77 -0.363111,-0.70515 -0.753123,-1.38371 -0.356518,-1.56165 0.396598,-0.17795 1.012463,0.24944 1.375577,0.95459 z"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.29030547;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path860"
+ d="m 19.76245,274.29452 c 0.188222,0.57125 0.145606,1.00347 -0.02484,1.29902 -0.19358,0.33565 -0.552741,-0.0612 -0.872477,-0.72636 -0.319735,-0.66519 -0.663159,-1.30529 -0.313933,-1.47315 0.349223,-0.16786 0.891524,0.2353 1.211262,0.90049 z"
+ style="opacity:1;vector-effect:none;fill:#f1f1f1;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ transform="rotate(-19.697772)"
+ ry="0.53453904"
+ rx="0.30903038"
+ cy="265.14505"
+ cx="-74.217613"
+ id="path863"
+ style="opacity:1;vector-effect:none;fill:#2c2c2c;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.21715648"
+ rx="0.20880431"
+ cy="274.60309"
+ cx="19.279617"
+ id="path865"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <ellipse
+ ry="0.10309207"
+ rx="0.10410537"
+ cy="274.95673"
+ cx="19.546465"
+ id="path865-3"
+ style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.12872283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ id="path3477-7"
+ d="m 23.231238,275.51885 c -0.475313,0.17168 -1.032544,0.23583 -1.49112,0.20881 -0.647096,1.23327 -0.727411,1.98537 -0.656018,2.22605 1.598152,0.65249 3.56276,-0.59159 3.975692,-2.15706 0.09629,-0.36448 -0.05991,-0.73339 -0.288422,-0.74807 -0.583036,0.0952 -1.096272,0.30979 -1.540132,0.47027 z"
+ style="fill:#e16b1e;fill-opacity:1;stroke:none;stroke-width:0.2435022" />
+ <path
+ id="path2998-6"
+ d="m 14.145288,294.66257 c -1.705557,0.0444 -4.9032399,-0.81863 -5.8499059,-1.25818 -1.3410988,-0.62586 -1.6496691,-1.19155 -1.7570847,-2.53033 -0.8300085,-0.89725 -1.7553622,-2.75009 -0.685411,-3.70052 1.1076225,-0.34104 2.730111,0.0892 3.3951756,0.37005 -0.095634,-0.45886 -0.3028553,-0.7253 0.3028553,-0.94734 2.9686177,-0.51611 6.2043917,-0.49434 8.7957077,1.76823 2.591319,2.26257 -1.111808,6.18243 -4.201337,6.29809 z"
+ style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:0.25017193" />
</g>
</svg>
diff --git a/src/activities/digital_electricity/digital_electricity.js b/src/activities/digital_electricity/digital_electricity.js
index 73e02b42d..ecd784222 100644
--- a/src/activities/digital_electricity/digital_electricity.js
+++ b/src/activities/digital_electricity/digital_electricity.js
@@ -1,657 +1,657 @@
/* GCompris - digital_electricity.js
*
* Copyright (C) 2016 Pulkit Gupta <pulkitnsit@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Pulkit Gupta <pulkitnsit@gmail.com> (Qt Quick port)
* Rudra Nil Basu <rudra.nil.basu.1996@gmail.com> (Qt Quick port)
* Timothée Giet <animtim@gmail.com> (mouse drag refactoring)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
var currentLevel = 1
var numberOfLevel
var items
var url = "qrc:/gcompris/src/activities/digital_electricity/resource/"
var toolDelete
var toolDeleteSticky
var selectedIndex
var animationInProgress
var selectedTerminal
var deletedIndex = []
var components = []
var connected = []
var determiningComponents = []
var processingAnswer
var currentZoom
var maxZoom = 0.375
var minZoom = 0.125
var defaultZoom = 0.25
var zoomStep = 0.0625
var direction = {
LEFT: -1,
RIGHT: 1,
UP: -2,
DOWN: 2
}
var viewPort = {
leftExtreme: 0,
rightExtreme: 1,
topExtreme: 0,
bottomExtreme: 1,
leftEdge: 0,
topEdge: 0
}
function start(items_) {
items = items_
currentLevel = 1
numberOfLevel = items.tutorialDataset.tutorialLevels.length
initLevel()
}
function stop() {
for(var i = 0 ; i < components.length ; ++i) {
var j
for(j = 0 ; j < deletedIndex.length ; ++j) {
if(deletedIndex[j] == i)
break
}
if(j == deletedIndex.length)
removeComponent(i)
}
}
function initLevel() {
items.bar.level = currentLevel
items.availablePieces.view.currentDisplayedGroup = 0
items.availablePieces.view.previousNavigation = 1
items.availablePieces.view.nextNavigation = 1
deletedIndex = []
components = []
connected = []
determiningComponents = []
animationInProgress = false
toolDelete = false
toolDeleteSticky = false
deselect()
updateToolTip("")
items.availablePieces.hideToolbar()
currentZoom = defaultZoom
items.availablePieces.zoomInBtn.state = "canZoomIn"
items.availablePieces.zoomOutBtn.state = "canZoomOut"
viewPort.leftEdge = 0
viewPort.topEdge = 0
items.playArea.x = items.mousePan.drag.maximumX
items.playArea.y = items.mousePan.drag.maximumY
if (!items.isTutorialMode) {
items.tutorialInstruction.index = -1
loadFreeMode()
} else {
// load tutorial levels from dataset
processingAnswer = false
var levelProperties = items.tutorialDataset.tutorialLevels[currentLevel - 1]
for (var i = 0; i < levelProperties.inputComponentList.length; i++) {
var currentInputComponent = levelProperties.inputComponentList[i]
items.availablePieces.model.append( {
"imgName": currentInputComponent.imageName,
"componentSrc": currentInputComponent.componentSource,
"imgWidth": currentInputComponent.width,
"imgHeight": currentInputComponent.height,
"toolTipText": currentInputComponent.toolTipText
})
}
for (var i = 0; i < levelProperties.playAreaComponentList.length; i++) {
var index = components.length
var currentPlayAreaComponent = levelProperties.playAreaComponentList[i]
var staticElectricalComponent = Qt.createComponent("qrc:/gcompris/src/activities/digital_electricity/components/" + currentPlayAreaComponent.componentSource)
components[index] = staticElectricalComponent.createObject(
items.playArea, {
"index": index,
"posX": levelProperties.playAreaComponentPositionX[i] * currentZoom,
"posY": levelProperties.playAreaComponentPositionY[i] * currentZoom,
"imgSrc": currentPlayAreaComponent.imageName,
"toolTipTxt": currentPlayAreaComponent.toolTipText,
"imgWidth": currentPlayAreaComponent.width * currentZoom,
"imgHeight": currentPlayAreaComponent.height * currentZoom,
"destructible": false
});
}
var _determiningComponentsIndex = levelProperties.determiningComponentsIndex
for (var i = 0; i < _determiningComponentsIndex.length; i++) {
determiningComponents[determiningComponents.length] = components[_determiningComponentsIndex[i]]
}
// creating wires
for (i = 0; i < levelProperties.wires.length; i++) {
var terminal_number = levelProperties.wires[i][1]
var outTerminal = components[levelProperties.wires[i][0]].outputTerminals.itemAt(terminal_number)
terminal_number = levelProperties.wires[i][3]
var inTerminal = components[levelProperties.wires[i][2]].inputTerminals.itemAt(terminal_number)
createWire(inTerminal, outTerminal, false)
}
if (levelProperties.introMessage.length != 0) {
items.tutorialInstruction.index = 0
items.tutorialInstruction.intro = levelProperties.introMessage
} else {
items.tutorialInstruction.index = -1
}
}
}
function loadFreeMode() {
var componentList = items.tutorialDataset.componentList
for (var i = 0; i < componentList.length; i++) {
items.availablePieces.model.append( {
"imgName": componentList[i].imageName,
"componentSrc": componentList[i].componentSource,
"imgWidth": componentList[i].width,
"imgHeight": componentList[i].height,
"toolTipText": componentList[i].toolTipText
})
}
}
function checkAnswer() {
if (processingAnswer)
return
processingAnswer = true
var problemType = items.tutorialDataset.tutorialLevels[currentLevel - 1].type
var levelProperties = items.tutorialDataset.tutorialLevels[currentLevel - 1]
if (problemType == items.tutorialDataset.problemType.lightTheBulb) {
if (determiningComponents[0].inputTerminals.itemAt(0).value == 1) {
items.bonus.good('tux')
} else {
- items.bonus.bad('tux')
+ items.bonus.bad('tux', items.bonus.checkAnswer)
processingAnswer = false
}
} else if (problemType == items.tutorialDataset.problemType.equation1Variable) {
var switch1 = determiningComponents[0]
var digitalLight = determiningComponents[1]
var switch1InitialState = switch1.imgSrc
for (var A = 0; A <= 1; A++) {
switch1.imgSrc = A == 1 ? "switchOn.svg" : "switchOff.svg"
updateComponent(switch1.index)
var operationResult = !A
if (operationResult != digitalLight.inputTerminals.itemAt(0).value) {
switch1.imgSrc = switch1InitialState
updateComponent(switch1.index)
- items.bonus.bad('tux')
+ items.bonus.bad('tux', items.bonus.checkAnswer)
processingAnswer = false
return
}
}
items.bonus.good('tux')
} else if (problemType == items.tutorialDataset.problemType.equation2Variables) {
var digitalLight = determiningComponents[determiningComponents.length - 1]
var switch1 = determiningComponents[0]
var switch2 = determiningComponents[1]
var switch1InitialState = switch1.imgSrc
var switch2InitialState = switch2.imgSrc
for (var A = 0; A <= 1; A++) {
for (var B = 0; B <= 1; B++) {
switch1.imgSrc = A == 1 ? "switchOn.svg" : "switchOff.svg"
switch2.imgSrc = B == 1 ? "switchOn.svg" : "switchOff.svg"
updateComponent(switch1.index)
updateComponent(switch2.index)
var operationResult = levelProperties.result(A, B)
if (operationResult != digitalLight.inputTerminals.itemAt(0).value) {
switch1.imgSrc = switch1InitialState
switch2.imgSrc = switch2InitialState
updateComponent(switch1.index)
updateComponent(switch2.index)
- items.bonus.bad('tux')
+ items.bonus.bad('tux', items.bonus.checkAnswer)
processingAnswer = false
return
}
}
}
items.bonus.good('tux')
} else if (problemType == items.tutorialDataset.problemType.equation3Variables) {
var switch1 = determiningComponents[0]
var switch2 = determiningComponents[1]
var switch3 = determiningComponents[2]
var digitalLight = determiningComponents[3]
var switch1InitialState = switch1.imgSrc
var switch2InitialState = switch2.imgSrc
var switch3InitialState = switch3.imgSrc
for (var A = 0; A <= 1; A++) {
for (var B = 0; B <= 1; B++) {
for (var C = 0; C <= 1; C++) {
switch1.imgSrc = A == 1 ? "switchOn.svg" : "switchOff.svg"
switch2.imgSrc = B == 1 ? "switchOn.svg" : "switchOff.svg"
switch3.imgSrc = C == 1 ? "switchOn.svg" : "switchOff.svg"
updateComponent(switch1.index)
updateComponent(switch2.index)
updateComponent(switch3.index)
var operationResult = levelProperties.result(A, B, C)
if (operationResult != digitalLight.inputTerminals.itemAt(0).value) {
switch1.imgSrc = switch1InitialState
switch2.imgSrc = switch2InitialState
switch3.imgSrc = switch3InitialState
updateComponent(switch1.index)
updateComponent(switch2.index)
updateComponent(switch3.index)
processingAnswer = false
- items.bonus.bad('tux')
+ items.bonus.bad('tux', items.bonus.checkAnswer)
return
}
}
}
}
items.bonus.good('tux')
} else if (problemType == items.tutorialDataset.problemType.others) {
if (currentLevel == 20) {
var bcdToSevenSegment = determiningComponents[0]
var decimalValue =
bcdToSevenSegment.inputTerminals.itemAt(3).value +
(bcdToSevenSegment.inputTerminals.itemAt(2).value * 2) +
(bcdToSevenSegment.inputTerminals.itemAt(1).value * 4) +
(bcdToSevenSegment.inputTerminals.itemAt(0).value * 8)
if (decimalValue == 6) {
items.bonus.good('tux')
return
}
- items.bonus.bad('tux')
+ items.bonus.bad('tux', items.bonus.checkAnswer)
processingAnswer = false
return
} else if (currentLevel == 21) {
var bcdCounter = determiningComponents[0]
var bcdOutput =
bcdCounter.outputTerminals.itemAt(3).value +
bcdCounter.outputTerminals.itemAt(2).value * 2 +
bcdCounter.outputTerminals.itemAt(1).value * 4 +
bcdCounter.outputTerminals.itemAt(0).value * 8
var bcdToSevenSegment = determiningComponents[1]
var decimalValue =
bcdToSevenSegment.inputTerminals.itemAt(3).value +
(bcdToSevenSegment.inputTerminals.itemAt(2).value * 2) +
(bcdToSevenSegment.inputTerminals.itemAt(1).value * 4) +
(bcdToSevenSegment.inputTerminals.itemAt(0).value * 8)
if (bcdCounter.inputTerminals.itemAt(0).wires.length == 0 ||
bcdCounter.outputTerminals.itemAt(0).wires.length == 0 ||
bcdCounter.outputTerminals.itemAt(1).wires.length == 0 ||
bcdCounter.outputTerminals.itemAt(2).wires.length == 0 ||
bcdCounter.outputTerminals.itemAt(3).wires.length == 0) {
items.bonus.bad('tux')
processingAnswer = false
return
}
if ((bcdOutput == decimalValue) && (bcdCounter.inputTerminals.itemAt(0).wires.length != 0) ) {
items.bonus.good('tux')
return
}
- items.bonus.bad('tux')
+ items.bonus.bad('tux', items.bonus.checkAnswer)
processingAnswer = false
}
}
}
function zoomIn() {
var previousZoom = currentZoom
currentZoom += zoomStep
if (currentZoom > maxZoom)
currentZoom = maxZoom
var zoomRatio = currentZoom / previousZoom
updateComponentDimension(zoomRatio)
if (currentZoom == maxZoom) {
items.availablePieces.zoomInBtn.state = "cannotZoomIn"
} else {
items.availablePieces.zoomInBtn.state = "canZoomIn"
}
items.availablePieces.zoomOutBtn.state = "canZoomOut"
if (items.zoomLvl < 0.5) {
items.zoomLvl += 0.125
}
}
function zoomOut() {
var previousZoom = currentZoom
currentZoom -= zoomStep
if (currentZoom < minZoom)
currentZoom = minZoom
var zoomRatio = currentZoom / previousZoom
updateComponentDimension(zoomRatio)
if (currentZoom == minZoom) {
items.availablePieces.zoomOutBtn.state = "cannotZoomOut"
} else {
items.availablePieces.zoomOutBtn.state = "canZoomOut"
}
items.availablePieces.zoomInBtn.state = "canZoomIn"
if (items.zoomLvl > 0) {
items.zoomLvl -= 0.125
}
}
function updateComponentDimension(zoomRatio) {
for (var i = 0; i < components.length; i++) {
components[i].posX *= zoomRatio
components[i].posY *= zoomRatio
components[i].imgWidth *= zoomRatio
components[i].imgHeight *= zoomRatio
}
}
function nextLevel() {
if(numberOfLevel < ++currentLevel) {
currentLevel = 1
}
reset();
}
function previousLevel() {
if(--currentLevel < 1) {
currentLevel = numberOfLevel
}
reset();
}
function reset() {
stop()
items.availablePieces.model.clear()
initLevel()
}
// Creates component from ListWidget to the drawing board area
function createComponent(x, y, componentIndex) {
x = x / items.playArea.width
y = y / items.playArea.height
var index
if(deletedIndex.length > 0) {
index = deletedIndex[deletedIndex.length - 1]
deletedIndex.pop()
}
else
index = components.length
var component = items.availablePieces.repeater.itemAt(componentIndex)
var electricComponent = Qt.createComponent("qrc:/gcompris/src/activities/digital_electricity/components/" +
component.source)
//console.log("Error loading component:", electricComponent.errorString())
components[index] = electricComponent.createObject(
items.playArea, {
"index": index,
"posX": x,
"posY": y,
"imgSrc": component.imageName,
"toolTipTxt": component.toolTipTxt,
"imgWidth": component.imageWidth * currentZoom,
"imgHeight": component.imageHeight * currentZoom,
"destructible": true
});
toolDeleteSticky = false
deselect()
componentSelected(index)
updateComponent(index)
}
/* Creates wire between two terminals. Condition for creation of wire is that an input terminal
* can only be connected to 1 wire, output terminals can be connected by any number of wires, and
* an input terminal can be connected with an output terminal only. 'connected' variable is used
* to make sure that an input is connected by only 1 wire.
*/
function terminalPointSelected(terminal) {
if(selectedTerminal == -1 || selectedTerminal == terminal)
selectedTerminal = terminal
else if((selectedTerminal.type != terminal.type) && (selectedTerminal.parent != terminal.parent)) {
var inTerminal = terminal.type == "In" ? terminal : selectedTerminal
var outTerminal = terminal.type == "Out" ? terminal : selectedTerminal
if(connected[inTerminal] == undefined || connected[inTerminal] == -1) {
createWire(inTerminal, outTerminal, true)
}
deselect()
}
else {
deselect()
selectedTerminal = terminal
terminal.selected = true
}
}
function createWire(inTerminal, outTerminal, destructible) {
var wireComponent = Qt.createComponent("qrc:/gcompris/src/activities/digital_electricity/Wire.qml")
var wire = wireComponent.createObject(
items.playArea, {
"from": outTerminal,
"to": inTerminal,
"destructible": destructible
});
inTerminal.value = outTerminal.value
inTerminal.wires.push(wire)
outTerminal.wires.push(wire)
updateWires(inTerminal.parent.index)
updateWires(outTerminal.parent.index)
updateComponent(inTerminal.parent.index)
connected[inTerminal] = outTerminal
}
/* Updates the output of the component. 'wireVisited' is used to update the value of
* each wire once which will avoid updating the outputs of components in an infinite loop.
*/
function updateComponent(index) {
var wireVisited = []
components[index].updateOutput(wireVisited)
}
/* Updates the orientation of the wire. It is called whenever a new wire is created or
* an object is rotated.
*/
function updateWires(index) {
var component = components[index]
if(component == undefined || component.noOfInputs == undefined || component.noOfOutputs == undefined)
return
var rotatedAngle = component.initialAngle * Math.PI / 180
for(var i = 0 ; i < component.noOfInputs ; ++i) {
var terminal = component.inputTerminals.itemAt(i)
if(terminal.wires.length != 0) {
var wire = terminal.wires[0]
var otherAngle = wire.from.parent.initialAngle * Math.PI / 180
var x = wire.from.xCenterFromComponent
var y = wire.from.yCenterFromComponent
var x1 = wire.from.xCenter - x + x * Math.cos(otherAngle) - y * Math.sin(otherAngle)
var y1 = wire.from.yCenter - y + x * Math.sin(otherAngle) + y * Math.cos(otherAngle)
x = terminal.xCenterFromComponent
y = terminal.yCenterFromComponent
var x2 = terminal.xCenter - x + x * Math.cos(rotatedAngle) - y * Math.sin(rotatedAngle)
var y2 = terminal.yCenter - y + x * Math.sin(rotatedAngle) + y * Math.cos(rotatedAngle)
var width = Math.pow((Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2)),0.5) + 2
var angle = (180/Math.PI)*Math.atan((y2-y1)/(x2-x1))
if(x2 - x1 < 0) angle = angle - 180
wire.x = x1
wire.y = y1 - wire.height / 2
wire.width = width
wire.rotation = angle
}
}
for(var i = 0 ; i < component.noOfOutputs ; ++i) {
var terminal = component.outputTerminals.itemAt(i)
for(var j = 0 ; j < terminal.wires.length ; ++j) {
var x = terminal.xCenterFromComponent
var y = terminal.yCenterFromComponent
var x1 = terminal.xCenter - x + x * Math.cos(rotatedAngle) - y * Math.sin(rotatedAngle)
var y1 = terminal.yCenter - y + x * Math.sin(rotatedAngle) + y * Math.cos(rotatedAngle)
var wire = terminal.wires[j]
var otherAngle = wire.to.parent.initialAngle * Math.PI / 180
x = wire.to.xCenterFromComponent
y = wire.to.yCenterFromComponent
var x2 = wire.to.xCenter - x + x * Math.cos(otherAngle) - y * Math.sin(otherAngle)
var y2 = wire.to.yCenter - y + x * Math.sin(otherAngle) + y * Math.cos(otherAngle)
var width = Math.pow((Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2)),0.5) + 2
var angle = (180/Math.PI)*Math.atan((y2-y1)/(x2-x1))
if(x2 - x1 < 0)
angle = angle - 180
wire.x = x1
wire.y = y1
wire.width = width
wire.rotation = angle
}
}
}
function deselect() {
if(toolDeleteSticky == false) {
toolDelete = false
items.availablePieces.toolDelete.state = "notSelected"
}
items.availablePieces.rotateLeft.state = "canNotBeSelected"
items.availablePieces.rotateRight.state = "canNotBeSelected"
items.availablePieces.info.state = "canNotBeSelected"
items.infoTxt.visible = false
selectedIndex = -1
selectedTerminal = -1
for(var i = 0 ; i < components.length ; ++i) {
var component = components[i]
for(var j = 0 ; j < component.noOfInputs ; ++j)
component.inputTerminals.itemAt(j).selected = false
for(var j = 0 ; j < component.noOfOutputs ; ++j)
component.outputTerminals.itemAt(j).selected = false
}
}
function removeComponent(index) {
var component = components[index]
for(var i = 0 ; i < component.noOfInputs ; ++i) {
var terminal = component.inputTerminals.itemAt(i)
if(terminal.wires.length != 0) // Input Terminal can have only 1 wire
removeWire(terminal.wires[0])
}
for(var i = 0 ; i < component.noOfOutputs ; ++i) {
var terminal = component.outputTerminals.itemAt(i)
while (terminal.wires.length != 0) {
removeWire(terminal.wires[0]) // Output Terminal can have more than 1 wire
}
}
components[index].destroy()
deletedIndex.push(index)
deselect()
}
function removeWire(wire) {
var inTerminal = wire.to
var outTerminal = wire.from
var removeIndex = inTerminal.wires.indexOf(wire)
inTerminal.wires.splice(removeIndex, 1)
removeIndex = outTerminal.wires.indexOf(wire)
outTerminal.wires.splice(removeIndex, 1)
connected[wire.to] = -1
inTerminal.value = 0
wire.destroy()
updateComponent(inTerminal.parent.index)
deselect()
}
function componentSelected(index) {
selectedIndex = index
items.availablePieces.rotateLeft.state = "canBeSelected"
items.availablePieces.rotateRight.state = "canBeSelected"
items.availablePieces.info.state = "canBeSelected"
}
function rotateLeft() {
components[selectedIndex].rotationAngle = -2
components[selectedIndex].rotateComponent.start()
}
function rotateRight() {
components[selectedIndex].rotationAngle = 2
components[selectedIndex].rotateComponent.start()
}
function displayInfo() {
var component = components[selectedIndex]
var componentTruthTable = component.truthTable
deselect()
items.infoTxt.visible = true
items.infoTxt.text = component.information
if(component.infoImageSrc != undefined) {
items.infoImage.imgVisible = true
items.infoImage.source = url + component.infoImageSrc
}
else {
items.infoImage.imgVisible = false
items.infoImage.source = ""
}
if(componentTruthTable.length == 0)
items.displayTruthTable = false
else {
items.displayTruthTable = true
var truthTable = items.truthTablesModel
truthTable.clear()
truthTable.rows = componentTruthTable.length
truthTable.columns = componentTruthTable[0].length
truthTable.inputs = component.noOfInputs
truthTable.outputs = component.noOfOutputs
for(var i = 0 ; i < componentTruthTable.length ; ++i)
for(var j = 0 ; j < componentTruthTable[i].length ; ++j)
truthTable.append({'value': componentTruthTable[i][j]})
}
}
function updateToolTip(toolTipTxt) {
items.toolTip.show(toolTipTxt)
}
diff --git a/src/activities/drawletters/drawletters_dataset.js b/src/activities/drawletters/drawletters_dataset.js
index 5b70a3fee..3cf1771de 100644
--- a/src/activities/drawletters/drawletters_dataset.js
+++ b/src/activities/drawletters/drawletters_dataset.js
@@ -1,193 +1,196 @@
/* GCompris - drawletters_dataset.js
* Copyright (C) 2016 Nitish Chauhan <nitish.nc18@gmail.com>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.import GCompris 1.0 as GCompris //for ApplicationInfo
.import "qrc:/gcompris/src/core/core.js" as Core
function get() {
return [
{
"imageName1": "paper.svg",
"imageName2": "A1.svg",
- "coordinates": [[136,402],[154,359],[171,316],[189,276],[207,230],[225,187],[242,144],[260,101],[278,58],[296,101],[314,144],[332,187],[350,230],[368,276],[386,316],[403,359],[420,402],[187,286],[235,286],[282,286],[330,286],[378,286]],
- "coordinates2": [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2],
+ "coordinates": [[278,58],[260,100],[242,144],[225,187],[207,230],[189,276],[171,316],[154,359],[136,402],[278,58],[296,104],[314,144],[332,187],[350,230],[368,276],[386,316],[403,359],[420,402],[187,286],[235,286],[282,286],[330,286],[378,286]],
+ "coordinates2": [1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,3,3,3,3,3],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("a"))
},
{
"imageName1": "paper.svg",
"imageName2": "B1.svg",
"coordinates": [[190,59],[190,93],[190,126],[190,165],[190,212],[190,263],[190,308],[190,342],[190,375],[190,409],[223,77],[262,77],[300,78],[340,80],[384,91],[417,114],[433,154],[427,194],[388,226],[360,235],[328,242],[291,240],[262,235],[234,234],[223,234],[251,246],[288,248],[322,248],[358,249],[394,263],[427,291],[440,322],[441,357],[417,390],[375,406],[346,411],[307,413],[267,413],[244,413],[215,409]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("b"))
},
{
"imageName1": "paper.svg",
"imageName2": "C1.svg",
"coordinates": [[435,160],[420,135],[391,110],[353,91],[318,86],[289,86],[255,93],[220,108],[184,136],[162,166],[147,211],[148,249],[157,282],[175,314],[198,340],[233,360],[278,372],[318,372],[361,362],[406,342],[427,315],[442,284]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("c"))
},
{
"imageName1": "paper.svg",
"imageName2": "D1.svg",
"coordinates": [[110,67],[110,98],[110,132],[110,173],[110,220],[110,267],[110,305],[110,347],[110,383],[110,410],[146,73],[184,78],[219,80],[255,81],[292,85],[328,90],[373,100],[408,118],[434,144],[456,174],[471,220],[475,268],[467,315],[437,356],[398,385],[346,401],[307,406],[260,409],[219,409],[190,409],[157,407]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("d"))
},
{
"imageName1": "paper.svg",
"imageName2": "E1.svg",
"coordinates": [[161,62],[161,95],[161,133],[161,175],[161,216],[161,256],[161,296],[161,336],[161,377],[186,78],[212,78],[242,78],[274,78],[304,78],[335,78],[368,78],[405,78],[186,220],[217,220],[253,220],[289,220],[322,220],[353,220],[390,220],[193,366],[222,366],[252,366],[285,366],[313,366],[346,366],[377,366],[408,366]],
"coordinates2": [1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("e"))
},
{
"imageName1": "paper.svg",
"imageName2": "F1.svg",
"coordinates": [[176,81],[176,107],[176,140],[176,180],[176,215],[176,256],[176,304],[176,339],[176,379],[176,415],[201,96],[230,96],[257,96],[291,96],[318,96],[343,96],[373,96],[411,96],[204,249],[227,249],[256,249],[292,249],[324,249],[357,249],[391,249]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("f"))
},
{
"imageName1": "paper.svg",
"imageName2": "G1.svg",
- "coordinates": [[446,147],[434,124],[411,97],[383,82],[347,70],[317,66],[275,73],[242,86],[208,107],[183,136],[164,172],[161,206],[165,256],[179,297],[206,328],[238,350],[282,366],[320,369],[362,366],[397,355],[428,344],[456,315],[455,288],[455,262],[455,234],[423,235],[395,235],[369,235],[339,235]],
+ "coordinates": [[446,147],[434,124],[411,97],[383,82],[347,70],[317,66],[275,73],[242,86],[208,107],[183,136],[164,172],[161,206],[165,256],[179,297],[206,328],[238,350],[282,366],[320,369],[362,366],[397,355],[428,344],[456,315],[455,288],[455,262],[455,234],[339,235],[369,235],[395,235],[423,235]],
+ "coordinates2": [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("g"))
},
{
"imageName1": "paper.svg",
"imageName2": "H1.svg",
"coordinates": [[165,71],[165,107],[165,160],[165,194],[165,235],[165,267],[165,310],[165,344],[165,379],[165,400],[182,228],[206,230],[240,230],[268,230],[296,230],[325,230],[350,230],[379,230],[404,230],[416,75],[416,104],[416,136],[416,169],[416,213],[416,262],[416,299],[416,340],[416,368],[416,393]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("h"))
},
{
"imageName1": "paper.svg",
"imageName2": "I1.svg",
"coordinates": [[248,78],[248,106],[248,148],[248,184],[248,220],[248,251],[248,282],[248,320],[248,357],[248,391],[248,409]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("i"))
},
{
"imageName1": "paper.svg",
"imageName2": "J1.svg",
"coordinates": [[369,71],[369,102],[369,136],[369,179],[369,224],[369,270],[369,306],[368,346],[348,375],[311,391],[277,394],[241,384],[213,348],[205,321]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("j"))
},
{
"imageName1": "paper.svg",
"imageName2": "K1.svg",
"coordinates": [[160,64],[160,102],[160,146],[160,190],[160,240],[160,281],[160,325],[160,366],[160,402],[160,402],[160,437],[186,273],[224,246],[257,219],[285,195],[315,169],[346,144],[375,124],[411,95],[444,68],[286,224],[310,257],[333,289],[366,318],[387,348],[411,373],[434,406],[459,434]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("k"))
},
{
"imageName1": "paper.svg",
"imageName2": "L1.svg",
"coordinates": [[177,64],[177,110],[177,158],[177,206],[177,264],[177,315],[177,365],[177,406],[177,420],[211,420],[245,420],[286,420],[326,420],[361,420],[404,420]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("l"))
},
{
"imageName1": "paper.svg",
"imageName2": "M1.svg",
- "coordinates": [[144,413],[144,377],[144,337],[144,297],[144,263],[144,227],[144,194],[144,148],[144,106],[144,73],[186,103],[198,137],[211,175],[222,204],[234,234],[249,263],[259,291],[274,325],[286,360],[302,393],[311,413],[325,379],[339,344],[354,311],[364,280],[376,246],[387,217],[401,184],[413,150],[426,115],[446,82],[462,114],[462,142],[462,171],[462,201],[462,233],[462,266],[462,306],[462,340],[462,372],[462,405]],
+ "coordinates": [[144,73],[144,106],[144,148],[144,194],[144,227],[144,263],[144,297],[144,337],[144,377],[144,413],[147,75],[174,80],[186,103],[198,137],[211,175],[222,204],[234,234],[249,263],[259,291],[274,325],[286,360],[302,393],[311,413],[325,379],[339,344],[354,311],[364,280],[376,246],[387,217],[401,184],[413,150],[426,115],[446,82],[462,114],[462,142],[462,171],[462,201],[462,233],[462,266],[462,306],[462,340],[462,372],[462,405]],
+ "coordinates2": [1,1,1,1,1,1,1,1,1,1],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("m"))
},
{
"imageName1": "paper.svg",
"imageName2": "N1.svg",
- "coordinates": [[186,376],[186,349],[186,324],[186,302],[186,279],[186,255],[186,226],[186,195],[186,172],[186,146],[186,127],[186,96],[206,118],[219,130],[234,150],[250,168],[265,185],[280,201],[295,223],[313,243],[327,260],[345,287],[368,312],[390,334],[410,349],[431,368],[431,343],[431,328],[431,296],[431,267],[431,245],[431,220],[431,194],[431,163],[431,137],[431,111],[431,96]],
+ "coordinates": [[186,96],[186,127],[186,146],[186,172],[186,195],[186,226],[186,255],[186,279],[186,302],[186,324],[186,349],[186,374],[186,96],[206,118],[219,130],[234,150],[250,168],[265,185],[280,201],[295,223],[313,243],[327,260],[345,287],[368,312],[390,334],[410,349],[431,368],[431,343],[431,328],[431,296],[431,267],[431,245],[431,220],[431,194],[431,163],[431,137],[431,111],[431,96]],
+ "coordinates2": [1,1,1,1,1,1,1,1,1,1,1,1,1],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("n"))
},
{
"imageName1": "paper.svg",
"imageName2": "O1.svg",
- "coordinates": [[291,71],[326,77],[360,89],[393,108],[417,132],[440,168],[452,209],[457,251],[453,302],[441,335],[426,369],[394,394],[357,415],[322,430],[284,430],[246,424],[215,411],[184,394],[160,364],[140,331],[125,292],[118,246],[131,195],[144,155],[165,122],[193,96],[228,78],[270,66]],
+ "coordinates": [[291,71],[270,66],[228,78],[193,96],[165,122],[144,155],[131,195],[118,246],[125,292],[140,331],[160,364],[184,394],[215,411],[246,424],[284,430],[322,430],[357,415],[394,394],[426,369],[441,335],[453,302],[457,251],[452,209],[440,168],[417,132],[393,108],[360,89],[326,77]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("o"))
},
{
"imageName1": "paper.svg",
"imageName2": "P1.svg",
"coordinates": [[154,56],[154,99],[154,132],[154,172],[154,212],[154,273],[154,324],[154,361],[154,400],[154,435],[169,73],[212,73],[248,74],[286,74],[324,78],[371,81],[420,96],[457,121],[477,161],[480,209],[455,249],[412,267],[380,273],[344,277],[308,277],[271,278],[235,275],[208,277],[184,277]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("p"))
},
{
"imageName1": "paper.svg",
"imageName2": "Q1.svg",
- "coordinates": [[321,107],[358,108],[393,122],[430,153],[456,193],[464,233],[466,270],[455,308],[423,347],[390,368],[346,382],[297,382],[260,376],[222,360],[193,332],[175,303],[161,270],[160,226],[172,188],[195,148],[233,120],[271,107],[299,99],[329,324],[360,337],[390,350],[413,366],[444,383],[473,397],[492,406]],
+ "coordinates": [[321,107],[299,99],[271,107],[233,120],[195,148],[172,188],[160,226],[161,270],[175,303],[193,332],[222,360],[260,376],[292,382],[346,382],[390,368],[423,347],[455,308],[466,270],[464,233],[456,193],[430,153],[393,122],[358,108],[329,324],[360,337],[390,350],[413,366],[444,383],[473,397],[492,406]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("q"))
},
{
"imageName1": "paper.svg",
"imageName2": "R1.svg",
"coordinates": [[143,86],[146,120],[146,160],[146,202],[146,246],[146,300],[146,344],[146,391],[146,428],[177,99],[212,100],[246,100],[286,100],[329,100],[377,118],[415,147],[428,191],[412,238],[364,256],[311,266],[268,266],[228,263],[202,259],[177,260],[202,277],[234,275],[273,280],[308,292],[339,322],[368,351],[387,379],[415,405],[437,428]],
"coordinates2": [1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("r"))
},
{
"imageName1": "paper.svg",
"imageName2": "S1.svg",
"coordinates": [[448,175],[434,148],[404,125],[366,110],[320,103],[277,104],[245,117],[202,132],[179,162],[176,200],[204,223],[248,237],[281,246],[325,253],[382,264],[423,277],[452,304],[456,343],[423,371],[382,388],[329,394],[284,390],[240,383],[205,368],[171,346],[148,307]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("s"))
},
{
"imageName1": "paper.svg",
"imageName2": "T1.svg",
"coordinates": [[150,85],[194,85],[233,85],[271,85],[313,85],[350,85],[394,85],[434,85],[304,111],[304,153],[304,186],[304,222],[304,262],[304,303],[304,344],[304,384],[304,424]],
"coordinates2": [1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("t"))
},
{
"imageName1": "paper.svg",
"imageName2": "U1.svg",
"coordinates": [[151,77],[151,118],[151,160],[151,195],[151,234],[151,275],[151,311],[171,351],[198,380],[242,400],[278,404],[320,402],[360,388],[395,369],[423,329],[430,284],[430,237],[430,201],[430,168],[430,136],[430,104],[430,78]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("u"))
},
{
"imageName1": "paper.svg",
"imageName2": "V1.svg",
"coordinates": [[188,110],[198,134],[205,156],[214,183],[224,207],[230,228],[239,254],[249,277],[260,303],[272,335],[284,359],[298,387],[315,352],[325,321],[341,280],[356,242],[367,212],[382,173],[395,143],[405,111]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("v"))
},
{
"imageName1": "paper.svg",
"imageName2": "W1.svg",
"coordinates": [[124,110],[134,142],[144,175],[154,207],[164,240],[174,272],[184,305],[194,337],[204,370],[214,337],[224,305],[234,272],[244,240],[254,207],[264,175],[274,142],[284,110],[294,142],[304,175],[314,207],[324,240],[334,272],[344,305],[354,337],[364,370],[374,337],[384,305],[394,272],[404,240],[414,207],[424,175],[434,142],[444,110]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("w"))
},
{
"imageName1": "paper.svg",
"imageName2": "X1.svg",
"coordinates": [[173,93],[191,115],[206,140],[224,161],[244,184],[267,212],[295,240],[313,267],[333,295],[355,321],[379,348],[400,373],[423,400],[424,92],[404,125],[380,153],[357,180],[332,211],[311,235],[277,275],[252,303],[226,333],[204,358],[186,379],[161,408]],
"coordinates2": [1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("x"))
},
{
"imageName1": "paper.svg",
"imageName2": "Y1.svg",
- "coordinates": [[165,91],[180,122],[200,154],[219,183],[235,213],[260,253],[285,292],[308,267],[331,234],[343,211],[360,186],[375,158],[388,136],[411,99],[289,303],[289,339],[289,371],[289,395],[289,420],[289,446]],
- "coordinates2": [1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2],
+ "coordinates": [[165,91],[180,122],[200,154],[219,183],[235,213],[260,253],[285,292],[411,99],[388,136],[375,158],[360,186],[343,211],[331,234],[308,267],[289,303],[289,339],[289,371],[289,395],[289,420],[289,446]],
+ "coordinates2": [1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,3,3,3,3,3],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("y"))
},
{
"imageName1": "paper.svg",
"imageName2": "Z1.svg",
"coordinates": [[180,146],[219,146],[252,146],[289,146],[328,146],[368,146],[413,146],[455,146],[427,179],[398,206],[375,228],[350,251],[321,274],[286,303],[256,332],[217,358],[177,384],[217,382],[253,384],[289,384],[320,384],[357,384],[394,384],[431,384],[475,384]],
"sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("z"))
}
]
}
diff --git a/src/activities/enumerate/ActivityInfo.qml b/src/activities/enumerate/ActivityInfo.qml
index c6bec1f6d..9382daeb7 100644
--- a/src/activities/enumerate/ActivityInfo.qml
+++ b/src/activities/enumerate/ActivityInfo.qml
@@ -1,40 +1,40 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Thib ROMAIN <thibrom@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "enumerate/Enumerate.qml"
difficulty: 2
icon: "enumerate/enumerate.svg"
author: "Thib ROMAIN &lt;thibrom@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Count the items")
//: Help title
description: qsTr("Place the items in the best way to count them")
// intro: "Count the elements by organising them then type the answer on your keyboard."
//: Help goal
goal: qsTr("Numeration training")
//: Help prerequisite
prerequisite: qsTr("Basic enumeration")
//: Help manual
- manual: qsTr("First, properly organize the items so that you can count them. Then, select the item you want to answer in the bottom right area. Enter the answer with the keyboard.")
+ manual: qsTr("First, properly organize the items so that you can count them. Then, select the item you want to answer in the top left area. Enter the answer with the keyboard.")
credit: ""
section: "math numeration"
createdInVersion: 0
}
diff --git a/src/activities/explore_farm_animals/ExploreFarmAnimals.qml b/src/activities/explore_farm_animals/ExploreFarmAnimals.qml
index cef03f4e1..cea614dd8 100644
--- a/src/activities/explore_farm_animals/ExploreFarmAnimals.qml
+++ b/src/activities/explore_farm_animals/ExploreFarmAnimals.qml
@@ -1,32 +1,33 @@
/* GCompris - ExploreFarmAnimals.qml
*
* Copyright (C) 2015 Djalil MESLI <djalilmesli@gmail.com>
*
* Authors:
* Beth Hadley <bethmhadley@gmail.com> (GTK+ version)
* Djalil MESLI <djalilmesli@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
ExploreLevels {
id: activity
numberOfLevels: 1
url: "qrc:/gcompris/src/activities/explore_farm_animals/resource/"
hasAudioQuestions: true
+ isMusicalActivity: true
}
diff --git a/src/activities/explore_farm_animals/ExploreLevels.qml b/src/activities/explore_farm_animals/ExploreLevels.qml
index 4ac1991e5..232c32e58 100644
--- a/src/activities/explore_farm_animals/ExploreLevels.qml
+++ b/src/activities/explore_farm_animals/ExploreLevels.qml
@@ -1,305 +1,313 @@
/* GCompris - ExploreLevels.qml
*
* Copyright (C) 2015 Ayush Agrawal <ayushagrawal288@gmail.com>
*
* Authors:
* Beth Hadley <bethmhadley@gmail.com> (GTK+ version)
* Ayush Agrawal <ayushagrawal288@gmail.com> (Qt Quick port)
* Djalil MESLI <djalilmesli@gmail.com> (Qt Quick port)
* Johnny Jazeix <jazeix@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import QtQuick.Controls 1.5
import "../../core"
import "explore-level.js" as Activity
ActivityBase {
id: activity
property int numberOfLevels
property string url
property bool hasAudioQuestions
onStart: focus = true
onStop: {}
pageComponent: Item {
id: background
/* In order to accept any screen ratio the play area is always a 1000x1000
* square and is centered in a big background image that is 2000x2000
*/
Image {
id: bg
source: dataset.item.backgroundImage
sourceSize.width: 2000 * ApplicationInfo.ratio
sourceSize.height: 2000 * ApplicationInfo.ratio
width: 2000 * background.playRatio
height: width
anchors.centerIn: parent
}
property bool horizontalLayout: background.width >= background.height
property int playX: (activity.width - playWidth) / 2
property int playY: (activity.height - playHeight) / 2
property int playWidth: horizontalLayout ? activity.height : activity.width
property int playHeight: playWidth
property double playRatio: playWidth / 1000
focus: true
signal start
signal stop
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property GCAudio audioVoices: activity.audioVoices
property GCSfx audioEffects: activity.audioEffects
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias score: score
property alias progressbar: progressbar
property alias ok: ok
property alias dataModel: dataModel
property alias dataset: dataset
property alias instruction: instruction
property alias instructionText: instructionText
property alias descriptionPanel: descriptionPanel
property alias nextQuestion: nextQuestion
property bool hasAudioQuestions: activity.hasAudioQuestions
property string currentAudio
property var questionOrder
property var currentQuestion: items.dataset ? items.dataset.item.tab[items.questionOrder[progressbar.value]] : ""
}
Timer {
id: nextQuestion
repeat: false
interval: 2000
onTriggered: {
Activity.repeat();
}
}
Loader{
id: dataset
asynchronous: false
onStatusChanged: {
if (status == Loader.Ready) {
// create table of size N filled with numbers from 0 to N
items.questionOrder = Array.apply(null, {length: items.dataModel.count}).map(Number.call, Number)
}
}
}
onStart: { Activity.start(items, url, numberOfLevels) }
onStop: { Activity.stop() }
Keys.onEscapePressed: {
descriptionPanel.visible ? descriptionPanel.closeDescriptionPanel() : home()
}
Repeater {
id: dataModel
model: dataset && dataset.item && dataset.item.tab ? dataset.item.tab.length : 0
AnimalLevels {
questionId: index
source: dataset.item.tab[index].image
x: background.playX + background.playWidth * dataset.item.tab[index].x - width / 2
y: background.playY + background.playHeight * dataset.item.tab[index].y - height / 2
width: background.playWidth * dataset.item.tab[index].width
height: background.playHeight * dataset.item.tab[index].height
title: dataset.item.tab[index].title
description: dataset.item.tab[index].text
imageSource: dataset.item.tab[index].image2
question: dataset.item.tab[index].text2
audio: dataset.item.tab[index].audio !== undefined ? dataset.item.tab[index].audio : ""
Component.onCompleted: {
displayDescription.connect(displayDescriptionItem)
}
}
}
function displayDescriptionItem(animal) {
descriptionPanel.title = animal.title
descriptionPanel.description = animal.description
descriptionPanel.imageSource = animal.imageSource
descriptionPanel.visible = true
descriptionPanel.showDescriptionPanel()
}
AnimalDescriptionLevels {
id: descriptionPanel
width: parent.width
height: parent.height
z: instruction.z + 1
}
Column {
id: progress
visible: items.score.currentSubLevel != 1
anchors.bottom: bar.top
anchors.right: parent.right
- anchors.margins: 10 * ApplicationInfo.ratio
+ anchors.rightMargin: 10 * ApplicationInfo.ratio
+ anchors.bottomMargin: progressbarText.height
ProgressBar {
id: progressbar
- height: progressbarText.height
- width: bar.width
property string message
onValueChanged: message = value + "/" + maximumValue
onMaximumValueChanged: message = value + "/" + maximumValue
GCText {
id: progressbarText
anchors.centerIn: parent
fontSize: mediumSize
font.bold: true
color: "black"
text: progressbar.message
}
+
+ Rectangle {
+ z: -1
+ radius: 5 * ApplicationInfo.ratio
+ anchors.centerIn: parent
+ height: progressbarText.height
+ width: parent.width
+ color: "#80EEEEEE"
+ }
}
}
Image {
id: ok
visible: progressbar.value === progressbar.maximumValue
source:"qrc:/gcompris/src/core/resource/bar_ok.svg"
sourceSize.width: questionText.height * 2
fillMode: Image.PreserveAspectFit
anchors.right: progress.left
anchors.bottom: bar.top
anchors.margins: 10 * ApplicationInfo.ratio
MouseArea {
anchors.fill: parent
onClicked: Activity.nextLevel()
}
}
Row {
id: row
spacing: 10 * ApplicationInfo.ratio
anchors.fill: parent
anchors.margins: 10 * ApplicationInfo.ratio
layoutDirection: leftCol.width === 0 ? Qt.RightToLeft : Qt.LeftToRight
Column {
id: leftCol
spacing: 10 * ApplicationInfo.ratio
Rectangle {
id: instruction
width: row.width - rightCol.width - 10 * ApplicationInfo.ratio
height: instructionText.height
color: "#CCCCCCCC"
radius: 10
border.width: 3
border.color: "black"
GCText {
id: instructionText
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.centerIn: parent.Center
color: "black"
width: parent.width
wrapMode: Text.Wrap
text: (dataset.item && items.score.currentSubLevel - 1 != items.score.numberOfSubLevels && items.score.currentSubLevel != 0) ? dataset.item.instructions[items.score.currentSubLevel - 1].text : ""
}
MouseArea {
anchors.fill: parent
onClicked: instruction.visible = false
enabled: instruction.visible
}
}
Rectangle {
id: question
width: row.width - rightCol.width - 10 * ApplicationInfo.ratio
height: questionText.height
color: '#CCCCCCCC'
radius: 10
border.width: 3
border.color: "black"
visible: items.score.currentSubLevel == 3 || (items.score.currentSubLevel == 2 && !items.hasAudioQuestions)
GCText {
id: questionText
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.centerIn: parent.Center
color: "black"
width: parent.width
wrapMode: Text.Wrap
text: items.currentQuestion ? items.currentQuestion.text2 : ""
}
}
}
Column {
id: rightCol
spacing: 10 * ApplicationInfo.ratio
Score {
id: score
anchors {
bottom: undefined
right: undefined
}
}
BarButton {
id: repeatItem
source: "qrc:/gcompris/src/core/resource/bar_repeat.svg";
sourceSize.width: 60 * ApplicationInfo.ratio
anchors.right: parent.right
visible: items.score.currentSubLevel == 2 && activity.hasAudioQuestions //&& ApplicationSettings.isAudioVoicesEnabled
onClicked: Activity.repeat();
}
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level | reload }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onReloadClicked: Activity.start(items, url, numberOfLevels)
}
Bonus {
id: bonus
}
}
}
diff --git a/src/activities/explore_world_music/ActivityInfo.qml b/src/activities/explore_world_music/ActivityInfo.qml
index 0cd4efb3a..42bcc7467 100644
--- a/src/activities/explore_world_music/ActivityInfo.qml
+++ b/src/activities/explore_world_music/ActivityInfo.qml
@@ -1,47 +1,47 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "explore_world_music/ExploreWorldMusic.qml"
difficulty: 4
icon: "explore_world_music/explore_world_music.svg"
author: "Johnny Jazeix &lt;jazeix@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Explore World Music")
//: Help title
description: qsTr("Learn about the music of the world.")
// intro: "Click on the suitcases to learn about music from around the world."
//: Help goal
goal: qsTr("Develop a better understanding of the variety of music present in the world")
//: Help prerequisite
prerequisite: ""
//: Help manual
manual: qsTr("There are three levels in this activity.
In the first level, enjoy exploring music from around the world. Click on each suitcase to learn about the music from that area, and listen to a short sample. Study well, because there will be two games related to this information next!
The second level is a matching game. You will hear a clip of music, and you must select the location that corresponds to that music. Click the play button if you'd like to hear the music again. You win the level when you have correctly matched all sound clips.
The third level is also a matching game. You must select the location that matches the text description on the screen. You win the level when you have correctly matched all text prompts.
")
- credit: qsTr("Images from http://commons.wikimedia.org/wiki, http://archive.org")
+ credit: qsTr("Images from https://commons.wikimedia.org/wiki, https://archive.org")
section: "discovery music"
createdInVersion: 0
}
diff --git a/src/activities/explore_world_music/ExploreWorldMusic.qml b/src/activities/explore_world_music/ExploreWorldMusic.qml
index bf839b897..f153c2418 100644
--- a/src/activities/explore_world_music/ExploreWorldMusic.qml
+++ b/src/activities/explore_world_music/ExploreWorldMusic.qml
@@ -1,34 +1,35 @@
/* GCompris - explore_world_music.qml
*
* Copyright (C) 2015 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Beth Hadley <bethmhadley@gmail.com> (GTK+ version)
* Johnny Jazeix <jazeix@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../explore_farm_animals"
ExploreLevels {
id: activity
numberOfLevels: 1
url: "qrc:/gcompris/src/activities/explore_world_music/resource/"
hasAudioQuestions: true
+ isMusicalActivity: true
}
diff --git a/src/activities/family_find_relative/ActivityInfo.qml b/src/activities/family_find_relative/ActivityInfo.qml
index f7a53f455..cd61797aa 100644
--- a/src/activities/family_find_relative/ActivityInfo.qml
+++ b/src/activities/family_find_relative/ActivityInfo.qml
@@ -1,42 +1,42 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2017 Rudra Nil Basu <rudra.nil.basu.1996@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "family_find_relative/Family_find_relative.qml"
difficulty: 2
icon: "family_find_relative/family_find_relative.svg"
author: "Rudra Nil Basu &lt;rudra.nil.basu.1996@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Point the relatives")
//: Help title
- description: "Click on a pair corresponding to the given relation"
+ description: qsTr("Click on a pair corresponding to the given relation")
//intro: "Click on a pair that defines the given relation"
//: Help goal
goal: qsTr("Learn the relationships in a family, according to the lineal system used in most Western societies")
//: Help prerequisite
prerequisite: qsTr("Reading, moving and clicking with the mouse")
//: Help manual
manual: qsTr("A family tree is shown, with some instructions.\n" +
"The circles are linked with lines to mark the relations. Married couples are marked with a ring on the link.\n" +
"Click on a pair of family members which corresponds to the given relation.")
credit: ""
section: "sciences history"
createdInVersion: 9000
}
diff --git a/src/activities/gletters/ActivityConfig.qml b/src/activities/gletters/ActivityConfig.qml
index 3ad895019..b55c298f3 100644
--- a/src/activities/gletters/ActivityConfig.qml
+++ b/src/activities/gletters/ActivityConfig.qml
@@ -1,106 +1,132 @@
/* GCompris - ActivityConfig.qml
*
* Copyright (C) 2019 Akshay Kumar <email.akshay98@gmail.com>
*
* Authors:
* Akshay Kumar <email.akshay98@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
+import GCompris 1.0
import "../../core"
Item {
id: activityConfiguration
property Item background
property alias localeBox: localeBox
property alias uppercaseBox: uppercaseBox
+ property alias speedSlider: speedSlider
+ property int speedSetting: 10
property bool uppercaseOnly: false
property string locale: "system"
height: column.height
width: if(background) background.width
property alias availableLangs: langs.languages
LanguageList {
id: langs
}
Column {
id: column
spacing: 10
Flow {
spacing: 5
- width: activityConfiguration.width
+ width: dialogActivityConfig.width
GCComboBox {
id: localeBox
- visible: true
model: langs.languages
- background: activityConfiguration.background
+ background: dialogActivityConfig
label: qsTr("Select your locale")
}
- }
- GCDialogCheckBox {
- id: uppercaseBox
- visible: true
- width: parent.width
- text: qsTr("Uppercase only mode")
- checked: activityConfiguration.uppercaseOnly
+
+ GCDialogCheckBox {
+ id: uppercaseBox
+ width: dialogActivityConfig.width
+ text: qsTr("Uppercase only mode")
+ checked: uppercaseOnly
+ }
+ GCText {
+ id: speedSliderText
+ text: qsTr("Speed")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ Flow {
+ width: dialogActivityConfig.width
+ spacing: 5
+ GCSlider {
+ id: speedSlider
+ width: 250 * ApplicationInfo.ratio
+ value: speedSetting
+ maximumValue: 10
+ minimumValue: 1
+ scrollEnabled: false
+ }
+ }
}
}
property var dataToSave
+
function setDefaultValues() {
// Recreate the binding
uppercaseBox.checked = Qt.binding(function(){return activityConfiguration.uppercaseOnly;})
var localeUtf8 = dataToSave.locale;
if(localeUtf8 !== "system") {
localeUtf8 += ".UTF-8";
}
for(var i = 0 ; i < activityConfiguration.availableLangs.length ; i ++) {
if(activityConfiguration.availableLangs[i].locale === localeUtf8) {
activityConfiguration.localeBox.currentIndex = i;
break;
}
}
activityConfiguration.locale = localeUtf8
activityConfiguration.uppercaseOnly = (dataToSave.uppercaseMode === "true")
+ activityConfiguration.speedSetting = dataToSave.speedSetting
}
function saveValues() {
var configHasChanged = false
var oldLocale = activityConfiguration.locale;
var newLocale = activityConfiguration.availableLangs[activityConfiguration.localeBox.currentIndex].locale;
// Remove .UTF-8
if(newLocale.indexOf('.') != -1) {
newLocale = newLocale.substring(0, newLocale.indexOf('.'))
}
var oldUppercaseMode = activityConfiguration.uppercaseOnly
activityConfiguration.uppercaseOnly = activityConfiguration.uppercaseBox.checked
- dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly}
+ var oldSpeed = activityConfiguration.speedSetting
+ speedSetting = speedSlider.value
+
+ dataToSave = {"locale": newLocale, "uppercaseMode": "" + activityConfiguration.uppercaseOnly, "speedSetting": speedSetting}
activityConfiguration.locale = newLocale;
- if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly) {
+
+ if(oldLocale !== newLocale || oldUppercaseMode !== activityConfiguration.uppercaseOnly || oldSpeed !== speedSetting) {
configHasChanged = true;
}
// Restart the activity with new information
if(configHasChanged) {
background.stop();
background.start();
}
}
}
diff --git a/src/activities/gletters/FallingWord.qml b/src/activities/gletters/FallingWord.qml
index 5d85a3082..c9ec1d13f 100644
--- a/src/activities/gletters/FallingWord.qml
+++ b/src/activities/gletters/FallingWord.qml
@@ -1,165 +1,165 @@
/* GCompris - Word.qml
*
* Copyright (C) 2014 Holger Kaelberer <holger.k@elberer.de>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Holger Kaelberer <holger.k@elberer.de> (Qt Quick port)
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtGraphicalEffects 1.0
import GCompris 1.0
import "../../core"
import "gletters.js" as Activity
Item {
id: word
width: wordText.width
height: wordText.height
/// index into text.split("") where next typed match should occur
property int unmatchedIndex: 0;
property alias text: wordText.text;
property bool wonState: false
property string mode
signal won
onWon: {
wonState = true
particle.burst(30)
dropShadow.opacity = 0
fadeout.restart();
}
Component.onCompleted: {
// make sure our word is completely visible
if (x + width >= parent.width)
x = parent.width - width;
}
onUnmatchedIndexChanged: {
if (unmatchedIndex <= 0)
highlightedWordText.text = "";
else if (wordText.text.length > 0 && wordText.text.length >= unmatchedIndex) {
highlightedWordText.text = wordText.text.substring(0, unmatchedIndex);
/* Need to add the ZERO WIDTH JOINER to force joined char in Arabic and
- * Hangul: http://en.wikipedia.org/wiki/Zero-width_joiner
+ * Hangul: https://en.wikipedia.org/wiki/Zero-width_joiner
*
* FIXME: this works only on desktop systems, on android this
* shifts the typed word a few pixels down. */
if (!ApplicationInfo.isMobile)
highlightedWordText.text += "\u200C";
}
}
PropertyAnimation {
id: fadeout
target: word;
property: "opacity"
to: 0
duration: 1000
onStopped: Activity.deleteWord(word);
}
function checkMatch(c)
{
// We are in the ending animation
if (wonState)
return
if(word.mode === 'letter') {
// Only highlight letter if it is the good one
unmatchedIndex = text === c ? c.length : 0
return (text === c)
} else {
var chars = text.split("");
if (chars[unmatchedIndex] === c) {
unmatchedIndex++;
return true;
} else {
unmatchedIndex = 0;
return false;
}
}
}
function startMoving(dur)
{
down.duration = dur;
down.restart();
}
function isCompleted()
{
return (unmatchedIndex === text.length);
}
GCText {
id: wordText
text: ""
fontSize: 35
font.bold: true
color: "navy"
style: Text.Outline
styleColor: "white"
ParticleSystemStarLoader {
id: particle
clip: false
}
GCText {
id: highlightedWordText
anchors.fill: parent
text: ""
fontSize: parent.fontSize
font.bold: parent.font.bold
color: "red"
style: Text.Outline
styleColor: "white"
}
}
DropShadow {
id: dropShadow
anchors.fill: wordText
cached: false
horizontalOffset: 1
verticalOffset: 1
radius: 3.0
samples: 16
color: "#422a2a2a"
source: wordText
}
NumberAnimation {
id: down
target: word
property: "y"
to: parent.height
duration: 10000
onStopped: {
Activity.audioCrashPlay();
Activity.appendRandomWord(word.text)
Activity.deleteWord(word);
}
}
}
diff --git a/src/activities/gletters/Gletters.qml b/src/activities/gletters/Gletters.qml
index 8e0b240a9..1d795ca4e 100644
--- a/src/activities/gletters/Gletters.qml
+++ b/src/activities/gletters/Gletters.qml
@@ -1,265 +1,276 @@
/* GCompris - gletters.qml
*
* Copyright (C) 2014 Holger Kaelberer <holger.k@elberer.de>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Holger Kaelberer <holger.k@elberer.de> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "gletters.js" as Activity
ActivityBase {
id: activity
// Overload this in your activity to change it
// Put you default-<locale>.json files in it
property string dataSetUrl: "qrc:/gcompris/src/activities/gletters/resource/"
- /* no need to display the configuration button for smallnumbers */
- property bool configurationButtonVisible: true
property bool uppercaseOnly: false
+
+ property int speedSetting: 10
property string activityName: "gletters"
/* mode of the activity, "letter" (gletters) or "word" (wordsgame):*/
property string mode: "letter"
// Override if you want to replace texts by your image
function getImage(key) {
return ""
}
// Override if you want to replace texts by the domino
function getDominoValues(key) {
return []
}
onStart: focus = true
onStop: {}
// When going on configuration, it steals the focus and re set it to the activity.
// We need to set it back to the textinput item in order to have key events.
onFocusChanged: {
if(focus) {
Activity.focusTextInput()
}
}
pageComponent: Image {
id: background
source: activity.dataSetUrl + "background.svg"
fillMode: Image.PreserveAspectCrop
sourceSize.height: parent.height
signal start
signal stop
// system locale by default
property string locale: "system"
Component.onCompleted: {
dialogActivityConfig.initialize()
activity.start.connect(start)
activity.stop.connect(stop)
}
QtObject {
id: items
property Item main: activity.main
property Item ourActivity: activity
property GCAudio audioVoices: activity.audioVoices
property var levels: activity.datasetLoader.data.length !== 0 ? activity.datasetLoader.data : null
property string instructionText: ""
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias wordlist: wordlist
property alias score: score
property alias keyboard: keyboard
property alias wordDropTimer: wordDropTimer
property GCSfx audioEffects: activity.audioEffects
property alias locale: background.locale
property alias textinput: textinput
}
onStart: {
- Activity.start(items, uppercaseOnly, mode);
+ // for smallnumbers and smallnumbers2, we want to have the application locale, not the system one
+ if(activity.activityName !== "gletters") {
+ var overridenLocale = ApplicationSettings.locale
+ // Remove .UTF-8
+ if(overridenLocale.indexOf('.') != -1) {
+ overridenLocale = overridenLocale.substring(0, overridenLocale.indexOf('.'))
+ }
+ background.locale = overridenLocale
+ }
+
+ Activity.start(items, uppercaseOnly, mode, speedSetting);
Activity.focusTextInput()
}
onStop: { Activity.stop() }
//instruction rectangle
Rectangle {
id: instruction
anchors {
top: parent.top
topMargin: 5
horizontalCenter: parent.horizontalCenter
}
height: instructionTxt.contentHeight * 1.1
width: Math.max(Math.min(parent.width * 0.8, instructionTxt.text.length * 10), parent.width * 0.3)
opacity: 0.8
visible: items.levels
radius: 10
border.width: 2
z: 10
border.color: "#DDD"
color: "#373737"
Behavior on opacity { PropertyAnimation { duration: 200 } }
//shows/hides the Instruction
MouseArea {
anchors.fill: parent
onClicked: instruction.opacity = instruction.opacity == 0 ? 0.8 : 0
}
GCText {
id: instructionTxt
anchors {
top: parent.top
topMargin: 5
horizontalCenter: parent.horizontalCenter
}
opacity: instruction.opacity
z: instruction.z
fontSize: smallSize
color: "white"
text: items.instructionText
horizontalAlignment: Text.AlignHCenter
width: parent.width * 0.8
wrapMode: TextEdit.WordWrap
}
}
TextInput {
// Helper element to capture composed key events like french ô which
// are not available via Keys.onPressed() on linux. Must be
// disabled on mobile!
id: textinput
anchors.centerIn: background
enabled: !ApplicationInfo.isMobile
focus: true
visible: false
onTextChanged: {
if (text != "") {
Activity.processKeyPress(text);
text = "";
}
}
}
DialogChooseLevel {
id: dialogActivityConfig
currentActivity: activity.activityInfo
onClose: {
home()
}
onSaveData: {
levelFolder = dialogActivityConfig.chosenLevels
currentActivity.currentLevels = dialogActivityConfig.chosenLevels
ApplicationSettings.setCurrentLevels(currentActivity.name, dialogActivityConfig.chosenLevels)
// todo this is triggered before the change of locale, so it is not taken in account!
background.stop()
background.start()
}
onLoadData: {
- if (activity.activityName == "gletters") {
+ if (activity.activityName === "gletters") {
if(activityData && activityData["locale"]) {
background.locale = activityData["locale"];
activity.uppercaseOnly = activityData["uppercaseMode"] === "true" ? true : false;
}
- } else if (activity.activityName == "smallnumbers2") {
+ } else if (activity.activityName === "smallnumbers2") {
if(activityData && activityData["mode"]) {
activity.dominoMode = activityData["mode"];
}
}
+ if(activityData && activityData["speedSetting"]) {
+ activity.speedSetting = activityData["speedSetting"];
+ }
}
onStartActivity: {
background.start()
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
anchors.bottom: keyboard.top
content: BarEnumContent { value: help | home | level | activityConfig }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onActivityConfigClicked: {
displayDialog(dialogActivityConfig)
}
}
Bonus {
id: bonus
interval: 2000
Component.onCompleted: win.connect(Activity.nextLevel)
}
Score {
id: score
- anchors.top: undefined
- anchors.topMargin: 10 * ApplicationInfo.ratio
anchors.right: parent.right
anchors.rightMargin: 10 * ApplicationInfo.ratio
- anchors.bottom: keyboard.top
+ anchors.bottom: bar.top
}
VirtualKeyboard {
id: keyboard
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
onKeypress: Activity.processKeyPress(text)
onError: console.log("VirtualKeyboard error: " + msg);
}
Wordlist {
id: wordlist
defaultFilename: activity.dataSetUrl + "default-en.json"
// To switch between locales: xx_XX stored in configuration and
// possibly correct xx if available (ie fr_FR for french but dataset is fr.)
useDefault: false
filename: ""
onError: console.log("Gletters: Wordlist error: " + msg);
}
Timer {
id: wordDropTimer
repeat: false
onTriggered: Activity.dropWord();
}
}
}
diff --git a/src/activities/gletters/gletters.js b/src/activities/gletters/gletters.js
index 8eea703f0..e60d270bd 100644
--- a/src/activities/gletters/gletters.js
+++ b/src/activities/gletters/gletters.js
@@ -1,424 +1,451 @@
/* GCompris - gletters.js
*
* Copyright (C) 2014-2016 Holger Kaelberer
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Holger Kaelberer <holger.k@elberer.de> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
/* ToDo / open issues:
* - adjust wordlist filenames once we have an ApplicationInfo.dataPath() or so
*/
.pragma library
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris //for ApplicationInfo
.import "qrc:/gcompris/src/core/core.js" as Core
var currentLevel = 0;
var currentSubLevel = 0;
var level = null;
var maxLevel = 0;
var maxSubLevel = 0;
var items;
var uppercaseOnly;
+var speedSetting;
var mode;
//speed calculations, common:
var speed = 0; // how fast letters fall
var fallSpeed = 0; // how often new letters are dropped
var incFallSpeed = 1000; // how much drop rate increases per sublevel
var incSpeed = 10; // how much speed increases per sublevel
// gletters:
var fallRateBase = 40; // default for how fast letters fall (smaller is faster)
var fallRateMult = 80; // default for how much falling speed increases per level (smaller is faster)
var dropRateBase = 5000; // default for how often new letters are dropped
var dropRateMult = 100; // default for how much drop rate increases per level
// wordsgame:
var wgMaxFallSpeed = 7000;
var wgMaxSpeed = 150;
var wgMinFallSpeed = 3000;
var wgMinSpeed = 50;
var wgDefaultFallSpeed = 8000;
var wgDefaultSpeed = 170;
var wgAddSpeed = 20;
var wgAddFallSpeed = 1000;
var wgMaxFallingItems;
var droppedWords;
+var droppedWordsCounter = 0;
var currentWord = null; // reference to the word currently typing, null if n/a
var wordComponent = null;
var successRate // Falling speed depends on it
-function start(items_, uppercaseOnly_, _mode) {
+function start(items_, uppercaseOnly_, _mode, speedSetting_) {
items = items_;
uppercaseOnly = uppercaseOnly_;
mode = _mode;
+ speedSetting = speedSetting_;
currentLevel = 0;
currentSubLevel = 0;
+ incSpeed = 1 * speedSetting;
+ incFallSpeed = 100 * speedSetting;
+
+ fallRateBase = 400 / speedSetting;
+ fallRateMult = 800 / speedSetting;
+ dropRateBase = 60000 / speedSetting;
+ dropRateMult = 1000 / speedSetting;
+
+ if (mode == "word") {
+ wgMaxFallSpeed = 90000 / speedSetting;
+ wgMaxSpeed = 1500 / speedSetting;
+ wgMinFallSpeed = 70000 / speedSetting;
+ wgMinSpeed = 1300 / speedSetting;
+ wgDefaultFallSpeed = 90000 / speedSetting;
+ wgDefaultSpeed = 1500 / speedSetting;
+ wgAddSpeed = 2 * speedSetting;
+ wgAddFallSpeed = 100 * speedSetting;
+ }
+
var locale = items.locale == "system" ? "$LOCALE" : items.locale
// register the voices for the locale
GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(GCompris.ApplicationInfo.getVoicesLocale(items.locale)));
if(!items.levels)
items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath(
items.ourActivity.dataSetUrl + "default-"+locale+".json"));
else
items.wordlist.loadFromJSON(items.levels);
// If wordlist is empty, we try to load from short locale and if not present again, we switch to default one
var localeUnderscoreIndex = locale.indexOf('_')
// probably exist a better way to see if the list is empty
if(items.wordlist.maxLevel == 0) {
var localeShort;
// We will first look again for locale xx (without _XX if exist)
if(localeUnderscoreIndex > 0) {
localeShort = locale.substring(0, localeUnderscoreIndex)
}
else {
localeShort = locale;
}
// If not found, we will use the default file
items.wordlist.useDefault = true
if(!items.levels)
items.wordlist.loadFromFile(GCompris.ApplicationInfo.getLocaleFilePath(
items.ourActivity.dataSetUrl + "default-"+localeShort+".json"));
else
items.wordlist.loadFromJSON(items.levels);
// We remove the using of default file for next time we enter this function
items.wordlist.useDefault = false
}
maxLevel = items.wordlist.maxLevel;
droppedWords = new Array();
+ droppedWordsCounter = 0;
initLevel();
}
function stop() {
deleteWords();
wordComponent = null
items.wordDropTimer.stop();
}
function initLevel() {
if(items.levels)
items.instructionText = items.levels[currentLevel].objective
items.audioVoices.clearQueue()
items.bar.level = currentLevel + 1;
wgMaxFallingItems = 3
successRate = 1.0
+ droppedWordsCounter = 0
// initialize level
deleteWords();
level = items.wordlist.getLevelWordList(currentLevel + 1);
maxSubLevel = items.wordlist.getMaxSubLevel(currentLevel + 1);
if (maxSubLevel == 0) {
// If "sublevels" length is not set in wordlist, use the words length
maxSubLevel = level.words.length
}
items.score.numberOfSubLevels = maxSubLevel;
setSpeed();
/*console.log("Gletters: initializing level " + (currentLevel + 1)
+ " maxSubLvl=" + maxSubLevel
+ " wordCount=" + level.words.length
+ " speed=" + speed + " fallspeed=" + fallSpeed);*/
{
/* populate VirtualKeyboard for mobile:
* 1. for < 10 letters print them all in the same row
* 2. for > 10 letters create 3 rows with equal amount of keys per row
* if possible, otherwise more keys in the upper rows
* 3. if we have both upper- and lowercase letters activate the shift
* key*/
// first generate a map of needed letters
var letters = new Array();
items.keyboard.shiftKey = false;
for (var i = 0; i < level.words.length; i++) {
if(mode ==='letter') {
// The word is a letter, even if it has several chars (digraph)
var letter = level.words[i];
var isUpper = (letter == letter.toLocaleUpperCase());
if (isUpper && letters.indexOf(letter.toLocaleLowerCase()) !== -1)
items.keyboard.shiftKey = true;
else if (!isUpper && letters.indexOf(letter.toLocaleUpperCase()) !== -1)
items.keyboard.shiftKey = true;
else if (letters.indexOf(letter) === -1)
letters.push(level.words[i]);
} else {
// We split each word in char to create the keyboard
for (var j = 0; j < level.words[i].length; j++) {
var letter = level.words[i].charAt(j);
var isUpper = (letter == letter.toLocaleUpperCase());
if (isUpper && letters.indexOf(letter.toLocaleLowerCase()) !== -1)
items.keyboard.shiftKey = true;
else if (!isUpper && letters.indexOf(letter.toLocaleUpperCase()) !== -1)
items.keyboard.shiftKey = true;
else if (letters.indexOf(letter) === -1)
letters.push(level.words[i].charAt(j));
}
}
}
letters = GCompris.ApplicationInfo.localeSort(letters, items.locale);
// generate layout from letter map
var layout = new Array();
var row = 0;
var offset = 0;
while (offset < letters.length-1) {
var cols = letters.length <= 10 ? letters.length : (Math.ceil((letters.length-offset) / (3 - row)));
layout[row] = new Array();
for (var j = 0; j < cols; j++)
layout[row][j] = { label: letters[j+offset] };
offset += j;
row++;
}
items.keyboard.layout = layout;
}
items.wordlist.initRandomWord(currentLevel + 1)
initSubLevel()
}
function initSubLevel() {
currentWord = null;
if (currentSubLevel != 0) {
// increase speed
speed = Math.max(speed - incSpeed, wgMinSpeed);
items.wordDropTimer.interval = fallSpeed = Math.max(fallSpeed - incFallSpeed, wgMinFallSpeed);
}
items.score.currentSubLevel = currentSubLevel + 1;
- if (currentSubLevel == 0 || droppedWords.length <= 1) // note, last word is still fading out
+ // note, last word is still fading out so better use droppedWordsCounter than droppedWords.length in this case
+ if (currentSubLevel == 0 || droppedWordsCounter == 0)
dropWord();
//console.log("Gletters: initializing subLevel " + (currentSubLevel + 1) + " words=" + JSON.stringify(level.words));
}
function processKeyPress(text) {
var typedText = uppercaseOnly ? text.toLocaleUpperCase() : text;
if (currentWord !== null) {
// check against a currently typed word
if (!currentWord.checkMatch(typedText)) {
currentWord = null;
audioCrashPlay()
} else {
playLetter(text)
}
} else {
// no current word, check against all available words
var found = false
for (var i = 0; i< droppedWords.length; i++) {
if (droppedWords[i].checkMatch(typedText)) {
// typed correctly
currentWord = droppedWords[i];
playLetter(text)
found = true
break;
}
}
if(!found) {
audioCrashPlay()
}
}
if (currentWord !== null && currentWord.isCompleted()) {
// win!
+ droppedWordsCounter -= 1
currentWord.won(); // note: deleteWord() is triggered after fadeout
successRate += 0.1
currentWord = null
nextSubLevel();
}
}
function setSpeed()
{
if (mode === "letter") {
speed = (level.speed !== undefined) ? level.speed : (fallRateBase + Math.floor(fallRateMult / (currentLevel + 1)));
- fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : Math.floor((dropRateBase + (dropRateMult * (currentLevel + 1))));
+ fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : Math.floor((dropRateBase - (dropRateMult * (currentLevel + 1))));
} else { // wordsgame
- speed = (level.speed !== undefined) ? level.speed : wgDefaultSpeed - (currentLevel+1)*wgAddSpeed;
- fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : wgDefaultFallSpeed - (currentLevel+1)*wgAddFallSpeed
+ speed = (level.speed !== undefined) ? level.speed : wgDefaultSpeed - (currentLevel + 1)*wgAddSpeed;
+ fallSpeed = (level.fallspeed !== undefined) ? level.fallspeed : wgDefaultFallSpeed - (currentLevel + 1)*wgAddFallSpeed
if(speed < wgMinSpeed ) speed = wgMinSpeed;
if(speed > wgMaxSpeed ) speed = wgMaxSpeed;
if(fallSpeed < wgMinFallSpeed ) fallSpeed = wgMinFallSpeed;
if(fallSpeed > wgMaxFallSpeed ) fallSpeed = wgMaxFallSpeed;
}
items.wordDropTimer.interval = fallSpeed;
}
function deleteWords()
{
if (droppedWords === undefined || droppedWords.length < 1)
return;
for (var i = 0; i< droppedWords.length; i++)
droppedWords[i].destroy();
droppedWords.length = 0;
}
function deleteWord(w)
{
if (droppedWords === undefined || droppedWords.length < 1)
return;
if (w == currentWord)
currentWord = null;
for (var i = 0; i< droppedWords.length; i++)
if (droppedWords[i] == w) {
droppedWords[i].destroy();
droppedWords.splice(i, 1);
break;
}
}
function createWord()
{
if (wordComponent.status == 1 /* Component.Ready */) {
var text = items.wordlist.getRandomWord();
if(!text) {
items.wordDropTimer.restart();
return
}
// if uppercaseOnly case does not matter otherwise it does
if (uppercaseOnly)
text = text.toLocaleUpperCase();
var word
if(items.ourActivity.getImage(text)) {
word = wordComponent.createObject( items.background,
{
"text": text,
"image": items.ourActivity.getImage(text),
// assume x=width-25px for now, Word auto-adjusts onCompleted():
"x": Math.random() * (items.main.width - 25),
"y": -25,
});
} else if(items.ourActivity.getDominoValues(text).length) {
word = wordComponent.createObject( items.background,
{
"text": text,
"mode": items.ourActivity.getMode(),
"dominoValues": items.ourActivity.getDominoValues(text),
// assume x=width-25px for now, Word auto-adjusts onCompleted():
"x": Math.random() * (items.main.width - 25),
"y": -25,
});
} else {
word = wordComponent.createObject( items.background,
{
"text": text,
// assume x=width-25px for now, Word auto-adjusts onCompleted():
"x": Math.random() * (items.main.width - 25),
"y": -25,
"mode": mode,
});
}
if (word === null)
console.log("Gletters: Error creating word object");
else {
droppedWords[droppedWords.length] = word;
+ droppedWordsCounter += 1
// speed to duration:
var duration = (items.main.height / 2) * speed / successRate;
/* console.debug("Gletters: dropping new word " + word.text
+ " duration=" + duration + " (speed=" + speed + ")"
+ " num=" + droppedWords.length);*/
word.startMoving(duration);
}
items.wordDropTimer.restart();
} else if (wordComponent.status == 3 /* Component.Error */) {
console.log("Gletters: error creating word component: " + wordComponent.errorString());
}
}
function dropWord()
{
// Do not create too many falling items
if(droppedWords.length > wgMaxFallingItems) {
items.wordDropTimer.restart();
return
}
if (wordComponent !== null)
createWord();
else {
var text = items.wordlist.getRandomWord();
items.wordlist.appendRandomWord(text)
var fallingItem
if(items.ourActivity.getImage(text))
fallingItem = "FallingImage.qml"
else if(items.ourActivity.getDominoValues(text).length)
fallingItem = "FallingDomino.qml"
else
fallingItem = "FallingWord.qml"
wordComponent = Qt.createComponent("qrc:/gcompris/src/activities/gletters/" + fallingItem);
if (wordComponent.status == 1 /* Component.Ready */)
createWord();
else if (wordComponent.status == 3 /* Component.Error */) {
console.log("Gletters: error creating word component: " + wordComponent.errorString());
} else
wordComponent.statusChanged.connect(createWord);
}
}
function appendRandomWord(word) {
items.wordlist.appendRandomWord(word)
}
function audioCrashPlay() {
if(successRate > 0.5)
successRate -= 0.1
items.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/crash.wav")
}
function nextLevel() {
if(maxLevel <= ++currentLevel ) {
currentLevel = 0
}
currentSubLevel = 0;
initLevel();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = maxLevel - 1
}
currentSubLevel = 0;
initLevel();
}
function nextSubLevel() {
if( ++currentSubLevel >= maxSubLevel) {
currentSubLevel = 0
items.bonus.good("lion")
} else
items.score.playWinAnimation();
initSubLevel();
}
function playLetter(letter) {
var locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale)
items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/"+locale+"/alphabet/"
+ Core.getSoundFilenamForChar(letter)))
}
function focusTextInput() {
if (!GCompris.ApplicationInfo.isMobile && items && items.textinput)
items.textinput.forceActiveFocus();
}
diff --git a/src/activities/gletters/resource/default-mk.json b/src/activities/gletters/resource/default-mk.json
new file mode 100644
index 000000000..015b0d5f3
--- /dev/null
+++ b/src/activities/gletters/resource/default-mk.json
@@ -0,0 +1,242 @@
+{
+ "levels" : [
+ {
+ "level" : "1",
+ "words" : [
+ "а",
+ "е",
+ "и",
+ "о",
+ "у"
+ ]
+ },
+ {
+ "level" : "2",
+ "words" : [
+ "б",
+ "в",
+ "г",
+ "д",
+ "ѓ",
+ "е",
+ "ж",
+ "з",
+ "ѕ",
+ "и",
+ "ј",
+ "к",
+ "л",
+ "љ",
+ "м"
+ ]
+ },
+ {
+ "level" : "3",
+ "words" : [
+ "н",
+ "њ",
+ "о",
+ "п",
+ "р",
+ "с",
+ "т",
+ "ќ",
+ "у",
+ "ф",
+ "х",
+ "ц",
+ "ч",
+ "џ",
+ "ш"
+ ]
+ },
+ {
+ "level" : "4",
+ "words" : [
+ "а",
+ "б",
+ "в",
+ "г",
+ "д",
+ "ѓ",
+ "е",
+ "ж",
+ "з",
+ "ѕ",
+ "и",
+ "ј",
+ "к",
+ "л",
+ "љ",
+ "м",
+ "н",
+ "њ",
+ "о",
+ "п",
+ "р",
+ "с",
+ "т",
+ "ќ",
+ "у",
+ "ф",
+ "х",
+ "ц",
+ "ч",
+ "џ",
+ "ш"
+ ]
+ },
+ {
+ "level" : "5",
+ "words" : [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "0"
+ ]
+ },
+ {
+ "level" : "6",
+ "words" : [
+ "А",
+ "Е",
+ "И",
+ "О",
+ "У"
+ ]
+ },
+ {
+ "level" : "7",
+ "words" : [
+ "Б",
+ "В",
+ "Г",
+ "Д",
+ "Ѓ",
+ "Е",
+ "Ж",
+ "З",
+ "Ѕ",
+ "И",
+ "Ј",
+ "К",
+ "Л",
+ "Љ",
+ "М"
+ ]
+ },
+ {
+ "level" : "8",
+ "words" : [
+ "Н",
+ "Њ",
+ "О",
+ "П",
+ "Р",
+ "С",
+ "Т",
+ "Ќ",
+ "У",
+ "Ф",
+ "Х",
+ "Ц",
+ "Ч",
+ "Џ",
+ "Ш"
+ ]
+ },
+ {
+ "level" : "9",
+ "words" : [
+ "Ѓ",
+ "Ж",
+ "З",
+ "Ѕ",
+ "Љ",
+ "Њ",
+ "Ќ",
+ "Х",
+ "Ц",
+ "Ч",
+ "Џ",
+ "Ш"
+ ]
+ },
+ {
+ "level" : "10",
+ "words" : [
+ "а",
+ "б",
+ "в",
+ "г",
+ "д",
+ "ѓ",
+ "е",
+ "ж",
+ "з",
+ "ѕ",
+ "и",
+ "ј",
+ "к",
+ "л",
+ "љ",
+ "м",
+ "н",
+ "њ",
+ "о",
+ "п",
+ "р",
+ "с",
+ "т",
+ "ќ",
+ "у",
+ "ф",
+ "х",
+ "ц",
+ "ч",
+ "џ",
+ "ш",
+ "А",
+ "Б",
+ "В",
+ "Г",
+ "Д",
+ "Ѓ",
+ "Е",
+ "Ж",
+ "З",
+ "Ѕ",
+ "И",
+ "Ј",
+ "К",
+ "Л",
+ "Љ",
+ "М",
+ "Н",
+ "Њ",
+ "О",
+ "П",
+ "Р",
+ "С",
+ "Т",
+ "Ќ",
+ "У",
+ "Ф",
+ "Х",
+ "Ц",
+ "Ч",
+ "Џ",
+ "Ш"
+ ]
+ }
+ ],
+ "name" : "default-mk",
+ "locale" : "mk",
+ "description" : "Macedonian"
+}
diff --git a/src/activities/gletters/resource/default-ml.json b/src/activities/gletters/resource/default-ml.json
index c43ddcb1a..e90d26d3f 100644
--- a/src/activities/gletters/resource/default-ml.json
+++ b/src/activities/gletters/resource/default-ml.json
@@ -1,256 +1,250 @@
{
"levels" : [
{
"level" : "1",
"words" : [
"അ",
"ആ",
"ഇ",
"ഈ",
"ഉ",
"ഊ",
"ഋ"
]
},
{
"level" : "2",
"words" : [
"എ",
"ഏ",
"ഐ",
"ഒ",
"ഓ",
- "ഔ",
- "അം",
- "അഃ"
+ "ഔ"
]
},
{
"level" : "3",
"words" : [
"അ",
"ആ",
"ഇ",
"ഈ",
"ഉ",
"ഊ",
"ഋ",
"എ",
"ഏ",
"ഐ",
"ഒ",
"ഓ",
- "ഔ",
- "അം",
- "അഃ"
+ "ഔ"
]
},
{
"level" : "4",
"words" : [
"ക",
"ഖ",
"ഗ",
"ഘ",
"ങ",
"ച",
"ഛ",
"ജ",
"ഝ",
"ഞ",
"ട",
"ഠ",
"ഡ",
"ഢ",
"ണ"
]
},
{
"level" : "5",
"words" : [
"ട",
"ഠ",
"ഡ",
"ഢ",
"ണ",
"ത",
"ഥ",
"ദ",
"ധ",
"ന",
"പ",
"ഫ",
"ബ",
"ഭ",
"മ"
]
},
{
"level" : "6",
"words" : [
"പ",
"ഫ",
"ബ",
"ഭ",
"മ",
"യ",
"ര",
"ല",
"വ",
"ശ",
"ഷ",
"സ",
"ഹ",
"ള",
"ഴ",
"റ"
]
},
{
"level" : "7",
"words" : [
"യ",
"ര",
"ല",
"വ",
"ശ",
"ഷ",
"സ",
"ഹ",
"ള",
"ഴ",
"റ",
"ൻ",
"ൾ",
"ർ",
"ൺ",
"ൽ"
]
},
{
"level" : "8",
"words" : [
"ക",
"ഖ",
"ഗ",
"ഘ",
"ങ",
"ച",
"ഛ",
"ജ",
"ഝ",
"ഞ",
"ട",
"ഠ",
"ഡ",
"ഢ",
"ണ",
"ത",
"ഥ",
"ദ",
"ധ",
"ന",
"പ",
"ഫ",
"ബ",
"ഭ",
"മ",
"യ",
"ര",
"ല",
"വ",
"ശ",
"ഷ",
"സ",
"ഹ",
"ള",
"ഴ",
"റ",
"ൻ",
"ൾ",
"ർ",
"ൺ",
"ൽ"
]
},
{
"level" : "9",
"words" : [
"അ",
"ആ",
"ഇ",
"ഈ",
"ഉ",
"ഊ",
"ഋ",
"എ",
"ഏ",
"ഐ",
"ഒ",
"ഓ",
- "ഔ",
- "അം",
- "അഃ",
+ "ഔ",
"ക",
"ഖ",
"ഗ",
"ഘ",
"ങ",
"ച",
"ഛ",
"ജ",
"ഝ",
"ഞ",
"ട",
"ഠ",
"ഡ",
"ഢ",
"ണ",
"ത",
"ഥ",
"ദ",
"ധ",
"ന",
"പ",
"ഫ",
"ബ",
"ഭ",
"മ",
"യ",
"ര",
"ല",
"വ",
"ശ",
"ഷ",
"സ",
"ഹ",
"ള",
"ഴ",
"റ",
"ൻ",
"ൾ",
"ർ",
"ൺ",
"ൽ"
]
},
{
"level" : "10",
"words" : [
"1",
"2",
"3",
"4",
"5",
"6",
"7",
"8",
"9",
"0"
]
}
],
"name" : "default-ml",
"locale" : "ml",
"description" : "Malayalam"
}
diff --git a/src/activities/guesscount/Tile.qml b/src/activities/guesscount/Tile.qml
index d3493f92b..4af9a1283 100644
--- a/src/activities/guesscount/Tile.qml
+++ b/src/activities/guesscount/Tile.qml
@@ -1,108 +1,108 @@
/* GCompris - Tile.qml
*
* Copyright (C) 2016 RAHUL YADAV <rahulyadav170923@gmail.com>
*
* Authors:
* Pascal Georges <pascal.georges1@free.fr> (GTK+ version)
* RAHUL YADAV <rahulyadav170923@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "guesscount.js" as Activity
import "../../core"
MouseArea {
id: mouseArea
property alias tile: tile
property alias datavalue: tile.datavalue
property var reparent: root
width: root.width
height: root.height
anchors.centerIn: parent
drag.target: tile
onReleased: {
parent = tile.Drag.target != null ? tile.Drag.target : root
tile.Drag.drop()
}
onParentChanged: {
if(parent.children.length>2 && root.type == "operators")
mouseArea.destroy()
}
onClicked: {
- if(Activity.items.warningDialog.visible)
- Activity.items.warningDialog.visible = false
+ if(items.warningDialog.visible)
+ items.warningDialog.visible = false
}
Rectangle {
id: tile
width: parent.width
height: parent.height
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
property var datavalue: modelData
radius: 10
//opacity: 0.7
//color: root.type == "operators" ? "red" : "green"
color: "#E8E8E8"
Drag.keys: [ type ]
Drag.active: mouseArea.drag.active
Drag.hotSpot.x: parent.width/2
Drag.hotSpot.y: parent.height/2
Rectangle {
id: typeLine
width: parent.width - anchors.margins
height: parent.height - anchors.margins
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: parent.height/8
radius: 10
color: root.type == "operators" ? "#E16F6F" : "#75D21B" // red or green
}
Rectangle {
id: insideFill
width: parent.width - anchors.margins
height: parent.height - anchors.margins
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
anchors.margins: parent.height/4
radius: 10
color: "#E8E8E8" //paper white
}
GCText {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
text: modelData
fontSize: mediumSize
}
states: [
State {
when: mouseArea.drag.active
ParentChange { target: tile; parent: root }
AnchorChanges { target: tile; anchors.verticalCenter: undefined; anchors.horizontalCenter: undefined }
},
State {
- when: Activity.items.warningDialog.visible
+ when: items.warningDialog.visible
PropertyChanges {
target: mouseArea
enabled: false
}
}
]
}
}
diff --git a/src/activities/hanoi/ActivityInfo.qml b/src/activities/hanoi/ActivityInfo.qml
index dc265ec43..8e0500a87 100644
--- a/src/activities/hanoi/ActivityInfo.qml
+++ b/src/activities/hanoi/ActivityInfo.qml
@@ -1,40 +1,40 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "hanoi/Hanoi.qml"
difficulty: 2
icon: "hanoi/hanoi.svg"
author: "Johnny Jazeix &lt;jazeix@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Simplified Tower of Hanoi")
//: Help title
description: qsTr("Reproduce the given tower")
//intro: "Rebuild the same tower in the empty area as the one you see on the right hand side."
//: Help goal
goal: qsTr("Reproduce the tower on the right in the empty space on the left")
//: Help prerequisite
prerequisite: qsTr("Mouse-manipulation")
//: Help manual
- manual: qsTr("Drag and Drop one top piece at a time, from one peg to another, to reproduce the tower on the right in the empty space on the left.")
+ manual: qsTr("Drag and Drop one top piece at a time, from one peg to another, to reproduce the tower on the right in the empty space on its left.")
credit: qsTr("Concept taken from EPI games.")
section: "discovery logic"
createdInVersion: 4000
}
diff --git a/src/activities/hanoi_real/ActivityInfo.qml b/src/activities/hanoi_real/ActivityInfo.qml
index 423e324f1..bb6a675ab 100644
--- a/src/activities/hanoi_real/ActivityInfo.qml
+++ b/src/activities/hanoi_real/ActivityInfo.qml
@@ -1,43 +1,43 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Amit Tomar <a.tomar@outlook.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "hanoi_real/HanoiReal.qml"
difficulty: 5
icon: "hanoi_real/hanoi_real.svg"
author: "Amit Tomar &lt;a.tomar@outlook.com&gt;"
demo: true
//: Activity title
title: qsTr("The Tower of Hanoi")
//: Help title
description: qsTr("Reproduce the tower on the right side")
//intro: "Rebuild the model tower on the right support. Take care, no disc may be placed atop a smaller disc."
//: Help goal
goal: qsTr("The object of the game is to move the entire stack to another peg, obeying the following rules:
only one disc may be moved at a time
no disc may be placed atop a smaller disc
")
//: Help prerequisite
prerequisite: ""
//: Help manual
manual: qsTr("Drag and drop the top pieces only from one peg to another, to reproduce the initial left side tower on the right peg.")
- credit: qsTr("The puzzle was invented by the French mathematician Edouard Lucas in 1883. There is a legend about a Hindu temple whose priests were constantly engaged in moving a set of 64 discs according to the rules of the Tower of Hanoi puzzle. According to the legend, the world would end when the priests finished their work. The puzzle is therefore also known as the Tower of Brahma puzzle. It is not clear whether Lucas invented this legend or was inspired by it. (source Wikipedia: http://en.wikipedia.org/wiki/Tower_of_hanoi)")
+ credit: qsTr("The puzzle was invented by the French mathematician Edouard Lucas in 1883. There is a legend about a Hindu temple whose priests were constantly engaged in moving a set of 64 discs according to the rules of the Tower of Hanoi puzzle. According to the legend, the world would end when the priests finished their work. The puzzle is therefore also known as the Tower of Brahma puzzle. It is not clear whether Lucas invented this legend or was inspired by it. (source Wikipedia: https://en.wikipedia.org/wiki/Tower_of_hanoi)")
section: "discovery logic"
createdInVersion: 4000
}
diff --git a/src/activities/instruments/Instruments.qml b/src/activities/instruments/Instruments.qml
index f06aeb17e..5bfee6045 100644
--- a/src/activities/instruments/Instruments.qml
+++ b/src/activities/instruments/Instruments.qml
@@ -1,32 +1,33 @@
/* GCompris - Instruments.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Original activity in the Gtk+ version of GCompris by
* Sylvain Dechy <syl.1@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../colors"
import "instruments.js" as Dataset
FindIt {
mode: "Instruments"
dataset: Dataset
backgroundImg: "qrc:/gcompris/src/activities/instruments/resource/background.svg"
+ isMusicalActivity: true
}
diff --git a/src/activities/lang/ActivityInfo.qml b/src/activities/lang/ActivityInfo.qml
index 0de2366d5..fdf442192 100644
--- a/src/activities/lang/ActivityInfo.qml
+++ b/src/activities/lang/ActivityInfo.qml
@@ -1,48 +1,48 @@
/* GCompris - lang.qml
*
* Copyright (C) Siddhesh suthar <siddhesh.it@gmail.com> (Qt Quick port)
*
* Authors:
* Pascal Georges (pascal.georges1@free.fr) (GTK+ version)
* Holger Kaelberer <holger.k@elberer.de> (Qt Quick port of imageid)
* Siddhesh suthar <siddhesh.it@gmail.com> (Qt Quick port)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Integration Lang dataset)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "lang/Lang.qml"
difficulty: 4
icon: "lang/lang.svg"
author: "siddhesh suthar &lt;siddhesh.it@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Enrich your vocabulary")
//: Help title
description: qsTr("Complete language learning activities.")
// intro: "Select the language you want to learn then review the words before doing the exercises."
//: Help goal
goal: qsTr("Enrich your vocabulary in your native language or in a foreign one.")
//: Help prerequisite
prerequisite: qsTr("Reading")
//: Help manual
manual: qsTr("Review a set of words. Each word is shown with a voice, a text and an image.<br/>"
+ "When done, you are suggested an exercise in which, given the voice, "
+ "you must find the right word. In the configuration, you can select the language you want to learn.")
- credit: qsTr("The images and voices come from the Art4Apps project: http://www.art4apps.org/.")
+ credit: qsTr("The images and voices come from the Art4Apps project: https://www.art4apps.org/.")
section: "reading vocabulary"
createdInVersion: 5000
}
diff --git a/src/activities/lang/resource/content-br.json b/src/activities/lang/resource/content-br.json
index f20eb27e6..9acb643b8 100644
--- a/src/activities/lang/resource/content-br.json
+++ b/src/activities/lang/resource/content-br.json
@@ -1,1092 +1,1092 @@
{
"10.ogg": "dek",
"11.ogg": "unnek",
"12.ogg": "daouzek",
"16.ogg": "c'hwezek",
"U0030.ogg": "mann",
"U0031.ogg": "unan",
"U0032.ogg": "daou",
"U0033.ogg": "tri",
"U0034.ogg": "pevar",
"U0035.ogg": "pemp",
"U0036.ogg": "c'hwec'h",
"U0037.ogg": "seizh",
"U0038.ogg": "eizh",
"U0039.ogg": "nav",
"accountant.ogg": "ur c'hoñcher",
"ache.ogg": "un taol-poan",
"acorn.ogg": "ur vezenn",
"actor.ogg": "un aktour",
"air_horn.ogg": "ur c'horn",
"alarmclock.ogg": "un dihuner",
"alligator.ogg": "un aligator",
"alphabet.ogg": "ul lizherenneg",
"anchor.ogg": "un eor",
"angel.ogg": "un ael",
"angry.ogg": "kounnaret",
"animal.ogg": "loened ",
"ankle.ogg": "an ibil-troad",
"ant.ogg": "ur verienenn",
"anteater.ogg": "ur merionaer",
"antelope.ogg": "un antilopenn",
"apple.ogg": "un aval",
"apple_tree.ogg": "ur wezenn avaloù",
"appliance.ogg": "un ardivink",
"apricot.ogg": "abrikez",
"arm.ogg": "ar vrec'h",
"armchair.ogg": "ur gador-vrec'h",
"artichoke.ogg": "artichaod",
"artist.ogg": "un arzour",
"asparagus.ogg": "asperjez",
"astronaut.ogg": "un egoraer",
"athlete.ogg": "ur sportour",
"avocado.ogg": "avoukez",
"ax.ogg": "ur vouc'hal",
"baby_bottle.ogg": "ur vured",
"back.ogg": "ar c'hein",
"badge.ogg": "ur vedalenn",
"bag.ogg": "ur sac'h",
"bait.ogg": "ur vouedenn",
"balance.ogg": "ur valañs",
"bald.ogg": "moal",
"ball.ogg": "ur vell",
"ball_of_yarn.ogg": "ur bellenn neud",
"ball_soccer.ogg": "ur vell-droad",
"ballet.ogg": "dañs",
"bank.ogg": "ur bank",
"banker_female.ogg": "ur plac'h ti-bank",
"bark.ogg": "harzhal",
"barn.ogg": "ur c'hrañch",
"bat.ogg": "un askell-groc'hen",
"bath.ogg": "ur gibell",
"bathing_suit.ogg": "ur sae gouronkañ",
"bay.ogg": "un hugenn",
"beach.ogg": "un draezhenn",
"bean.ogg": "fav",
"bear.ogg": "un arzh",
"beard.ogg": "ar barv",
"beat.ogg": "skeiñ",
"beaver.ogg": "un avank",
"bed.ogg": "ur gwele",
"bedroom.ogg": "ur gambr",
"bee.ogg": "ur wenanenn",
"beetle.ogg": "ur c'hwil",
"beg.ogg": "chipañ",
"behind.ogg": "a-dreñv",
"bell.ogg": "ur c'hloc'h",
"belly.ogg": "ar c'hof",
"bench.ogg": "ur bank",
"bib.ogg": "un divabouzouer",
"big.ogg": "bras",
"big_top.ogg": "ur babell",
"bike.ogg": "ur velo",
"bird.ogg": "un evn",
"bit.ogg": "un tamm",
"bite.ogg": "dantañ",
"black.ogg": "du",
"blackberry.ogg": "mouar",
"blackbird.ogg": "ur voualc'h",
"blade.ogg": "ul lavnenn",
"blind.ogg": "dall",
"blink.ogg": "gwignal",
"block.ogg": "ur blok",
"blond.ogg": "melegan",
"blue.ogg": "glas",
"blueberry.ogg": "lus",
"blush.ogg": "ur ruziañ",
"board.ogg": "ur plankenn",
"boat.ogg": "ur vag",
"boil.ogg": "birviñ",
"bolt.ogg": "ur boulon",
"bomb.ogg": "ur vombezenn",
"bone.ogg": "un askorn",
"book.ogg": "ul levr",
"bookcase.ogg": "un armel-levrioù",
"bottom.ogg": "feskennoù",
"box.ogg": "ur vouest",
"boxer.ogg": "ur bokser",
"boy.ogg": "ur paotr",
"braid.ogg": "ur blezhenn",
"brain.ogg": "an empenn",
"branch.ogg": "ur skourr",
"bread.ogg": "bara",
"break.ogg": "terriñ",
"breast.ogg": "ar bruched",
"brick.ogg": "brikennoù",
"bricklayer.ogg": "ur masoner",
"bride.ogg": "ur bried",
"bridge.ogg": "ur pont",
"bright.ogg": "sklaer",
"broccoli.ogg": "ur penn-brikoli",
"brother.ogg": "ur breur",
"brown.ogg": "gell",
"brush.ogg": "ur broust",
"bubble.ogg": "ur glogorenn",
"bucket.ogg": "ur c'helorn",
"bud.ogg": "ur vroñsenn",
"buffalo.ogg": "ur bizon",
"bug.ogg": "un amprevan",
"bulb.ogg": "ur glogorenn dredan",
"bull.ogg": "un tarv",
"bump.ogg": "ur bos",
"bun.ogg": "bara dous",
"bus.ogg": "ur c'harr-boutin",
"bush.ogg": "ur vodenn",
"butcher.ogg": "ur c'higer",
"butter.ogg": "amann",
"butterfly.ogg": "ur valafenn",
"button.ogg": "ur bouton",
"cabbage.ogg": "ur gaolenn",
"cabin.ogg": "ur gabanenn",
"cacao.ogg": "kakao",
"cactus.ogg": "ur gaktuzenn",
"cage.ogg": "ur gaoued",
"cake.ogg": "ur wastell",
"call.ogg": "gervel",
"camel.ogg": "ur c'hañval",
"camera.ogg": "ur poltreder",
"camp.ogg": "ar c'hampiñ",
"can.ogg": "boestoù-mir",
"canary.ogg": "ur c'hanari",
"candle.ogg": "ur c'houlaouenn",
"candy.ogg": "ur madig",
"cane.ogg": "ur vazh-kamm",
"canoe.ogg": "ur c'hanoe",
"canon.ogg": "ur c'hanol",
"canyon.ogg": "ur c'hanion",
"cap.ogg": "ur gasketenn",
"cape.ogg": "ur c'hab",
"car.ogg": "ur c'harr",
"carafe.ogg": "ur garafenn",
"card.ogg": "ur gartenn",
"carnival.ogg": "ar Meurlarjez",
"carpenter.ogg": "ur c'halvez",
"carpet.ogg": "un tapis",
"carrot.ogg": "ur garotezenn",
"cart.ogg": "ur garrigell",
"cash.ogg": "arc'hant",
"castle.ogg": "ur c'hastell",
"cat.ogg": "ur c'hazh",
"cat_female.ogg": "ur gazhez",
"catch.ogg": "tapout",
"caterpillar.ogg": "ur viskoulenn",
"cauldron.ogg": "ur chaodouron",
"cauliflower.ogg": "ur gaolenn-fleur",
"cave.ogg": "ur c'hroc'h",
"cavern.ogg": "ur vougev",
"celery.ogg": "un achenn",
"centipede.ogg": "ur mil-kraban",
"cereal.ogg": "ed",
"chain.ogg": "ur chadenn",
"chair.ogg": "ur gador",
"chalk.ogg": "krei",
"chameleon.ogg": "ur c'hameleon",
"chandelier.ogg": "ur c'hantoller",
"chat.ogg": "flapiñ",
"cheek.ogg": "ur jod",
"cheer.ogg": "youc'hal",
"cheese.ogg": "fourmaj",
"chef.ogg": "ur mestr-keginer",
"cherry.ogg": "kerez",
"chest.ogg": "ur c'hofr",
- "chick.ogg": "ur pousin",
+ "chick.ogg": "ur poñsin",
"chicken.ogg": "ur yarig",
"child.ogg": "ur bugel",
"chimney.ogg": "ur siminal",
"chimp.ogg": "ur chimpanze",
"chin.ogg": "an elgezh",
"chocolate.ogg": "chokolad",
"chop.ogg": "troc'hañ",
"chores.ogg": "labourioù an ti",
"christmas.ogg": "an Nedeleg",
"cigar.ogg": "ur segalenn",
"circus.ogg": "ur sirk",
"city.ogg": "ur gêr",
"clam.ogg": "ur c'hrogen Sant-Jakez",
"clap.ogg": "stlakal",
"class.ogg": "ur c'hlas",
"claw.ogg": "ur skilf",
"clay.ogg": "pri",
"clean.ogg": "naetaat",
"cleaning_lady.ogg": "ur plac'h-ti",
"cliff.ogg": "un tarroz",
"climb.ogg": "pignat",
"clock.ogg": "un horolaj",
"cloth.ogg": "gwiad",
"clothes_hanger.ogg": "un doug-dilhad",
"cloud.ogg": "ur goumoulenn",
"cloudy.ogg": "koumoulek",
"clover.ogg": "ur velchonenn",
"clown.ogg": "ur furlukin",
"coach.ogg": "ur gourdoner",
"coast.ogg": "un aod",
"coat.ogg": "ur vantell",
"cobra.ogg": "ur c'hobra",
"coconut.ogg": "ur graonenn-goko",
"cod.ogg": "ur voruenn",
"coffee.ogg": "kafe",
"coin.ogg": "ur pezh moneiz",
"cold.ogg": "yen",
- "color.ogg": "liv",
+ "color.ogg": "livioù",
"colt.ogg": "un ebeul",
"comb.ogg": "ur skribl",
"cone.ogg": "ur gernenn",
"cook.ogg": "keginañ",
"cookie.ogg": "kouign",
"cork.ogg": "ur stouv",
"corn.ogg": "maiz",
"couch.ogg": "ur gourvezvank",
"cough.ogg": "pasaat",
"couple.ogg": "ur c'houblad",
"cow.ogg": "ur vuoc'h",
"cowboy.ogg": "ur c'howboy",
"crab.ogg": "ur c'hrank",
"cradle.ogg": "ur gwele-babig",
"craft.ogg": "labour dorn",
"crawl.ogg": "skrampañ",
"crazy.ogg": "foll",
"creek.ogg": "ur stêrig",
"crepe.ogg": "ur grampouezhenn",
"crib.ogg": "kevell",
"croak.ogg": "koagal",
"crocodile.ogg": "ur c'hrokodil",
"cross.ogg": "ur groaz",
"crow.ogg": "ur vran",
"crown.ogg": "ur gurunenn",
"crumb.ogg": "bruzun",
"crust.ogg": "kreun",
"cry.ogg": "leñvañ",
"crystal.ogg": "ur strinkenn",
"cube.ogg": "ur c'hub",
"cucumber.ogg": "kokombrez",
"curtain.ogg": "rideozioù",
"cut.ogg": "troc'hañ",
"cute.ogg": "moutig",
"dad.ogg": "un tad",
"daffodil.ogg": "roz-kamm",
"daisy.ogg": "un tommheolig",
"dam.ogg": "ur stankell",
"dance.ogg": "dañsal",
"dandelion.ogg": "ur c'hwervizon",
"dart_board.ogg": "ur c'hoari biroùigoù",
"date_fruit.ogg": "datez",
"deer.ogg": "ur c'harv",
"den.ogg": "un douarenn",
"desert.ogg": "un dezerzh",
"desk.ogg": "ur burev",
"dessert.ogg": "un dibenn-pred",
"diamond.ogg": "un diamant",
"dig.ogg": "kleuziañ",
"dirt.ogg": "douar",
"dirty.ogg": "lous",
"dish.ogg": "ur plad",
"dishcloth.ogg": "un torch",
"dive.ogg": "splujañ",
"doctor.ogg": "ur mezeg",
"doe.ogg": "un heizez",
"dog.ogg": "ur c'hi",
"doll.ogg": "ur boupinell",
"dolphin.ogg": "un delfin",
"domino.ogg": "dominoioù",
"door.ogg": "un nor",
"doormat.ogg": "un torch-treid",
"dot.ogg": "ur pik",
- "doughnut.ogg": "ur bignezenn",
+ "doughnut.ogg": "ur vignezenn",
"dove.ogg": "ur goulm",
"dragon.ogg": "un aerouant",
"dragonfly.ogg": "un nadoz-aer",
"draw.ogg": "tresañ",
"drawer.ogg": "un diretenn",
"dream.ogg": "huñvreal",
"dress.ogg": "ur sae",
"drink.ogg": "evañ",
"drip.ogg": "un dakenn",
"drive.ogg": "bleniañ",
"drool.ogg": "babouzat",
"drum.ogg": "un taboulin",
"dry.ogg": "sec'hañ",
"duck.ogg": "un houad",
"duck_mother.ogg": "un houadez",
"dune.ogg": "un tevenn",
"dwarf.ogg": "ur c'horr",
"eagle.ogg": "un erer",
"ear.ogg": "ur skouarn",
"earth.ogg": "an douar",
"eat.ogg": "debriñ",
"egg.ogg": "ur vi",
"eggplant.ogg": "ur verjinezenn",
"elbow.ogg": "un ilin",
"electrician.ogg": "un tredaner",
"elk.ogg": "un elan",
"empty.ogg": "goullo",
"engine.ogg": "ur c'heflusker",
"engineer.ogg": "un ijinour",
"eraser.ogg": "ur c'homenn",
"explore.ogg": "ergerzhout",
"eyelash.ogg": "ur valvenn",
"eyes.ogg": "daoulagad",
"face.ogg": "un dremm",
"fair.ogg": "ur foar",
"fairy.ogg": "ur voudig",
"fall.ogg": "kouezhañ",
"fall_season.ogg": "an diskar-amzer",
"family.ogg": "ur familh",
"fan.ogg": "ur wenterez",
"farm.ogg": "un atant",
"farmer.ogg": "ur peizant",
"fat.ogg": "tev",
"faucet.ogg": "ur c'hog-dour",
"fawn.ogg": "ur menn-karv",
"fear.ogg": "ar spont",
"feast.ogg": "ur fest",
"feather.ogg": "ur bluñvenn",
"feed.ogg": "magañ",
"femur.ogg": "gwerzhid ur vorzhed",
"fetch.ogg": "mont da gerc'hat",
"fig.ogg": "figez",
"fin.ogg": "un angell",
"find.ogg": "kavout",
"finger.ogg": "ur biz",
"fire.ogg": "tan",
"fire_extinguisher.ogg": "ur mouger-tan",
"fireman.ogg": "ur pomper",
"fish.ogg": "ur pesk",
"fisherman.ogg": "ur pesketaer",
"fist.ogg": "un dorn",
"flacon.ogg": "ur flask",
"flag.ogg": "ur banniel",
"flame.ogg": "ur flammenn",
"flamingo.ogg": "ur flammeg",
"flash.ogg": "un etev tredan",
"flat.ogg": "ranntiez",
"flies.ogg": "kelien",
"float.ogg": "flotañ",
"flour.ogg": "bleud",
- "flower.ogg": "ur vleuñvenn",
+ "flower.ogg": "ur vleunienn",
"fluff.ogg": "un dumedenn",
"flute.ogg": "ur fleüt",
"fly.ogg": "nijal",
"foam.ogg": "spoum",
"foot.ogg": "un troad",
"forest.ogg": "ur c'hoad",
- "fork.ogg": "ur fourchetezenn",
+ "fork.ogg": "ur fourchetez",
"fountain.ogg": "ur feunteun",
"fox.ogg": "ul louarn",
"freeze.ogg": "skornañ",
"friend.ogg": "mignoned",
"fries.ogg": "fritez",
"frog.ogg": "ur ran",
"front.ogg": "dirak",
"fruit.ogg": "frouezh",
"fudge.ogg": "karamell",
"full.ogg": "leun",
"fur.ogg": "ur feur",
"game.ogg": "ur c'hoari",
"garage.ogg": "ur c'harrdi",
"garden.ogg": "ul liorzh",
"garlic.ogg": "ur penn-kignen",
"gem.ogg": "ur maen-sked",
"giant.ogg": "ur ramz",
"gift.ogg": "ur prof",
"giraffe.ogg": "ur jirafenn",
"girl.ogg": "ur plac'h",
"glass.ogg": "ur werenn",
"glasses.ogg": "ur re lunedoù",
"glove.ogg": "manegoù",
"glue.ogg": "peg",
"gnome.ogg": "ur c'horrigan",
"goat.ogg": "ur c'havr",
"golden.ogg": "alaouret",
"golf.ogg": "ar golf",
"goose.ogg": "ur waz",
"gorilla.ogg": "ur gorilh",
"grain.ogg": "greun",
"grandmother.ogg": "ur vamm-gozh",
"grape.ogg": "rezin",
"grapefruit.ogg": "pampel",
"grass.ogg": "geot",
"grave.ogg": "ur bez",
"gray.ogg": "griz",
"green.ogg": "gwer",
"grill.ogg": "ur c'hrilh",
"grin.ogg": "ur mousc'hoarzh",
"ground.ogg": "ul leur",
"growl.ogg": "krozal",
"guignol.ogg": "ur meurlarjez",
"guinea_pig.ogg": "ur razh-indez",
"gum.ogg": "gom-chaokat",
"hair.ogg": "blev",
"hair_dryer.ogg": "ur sec'her-blev",
"half.ogg": "an hanter",
"ham.ogg": "morzhed-hoc'h",
"hamburger.ogg": "un hamburger",
"hammer.ogg": "ur morzhol",
"hand.ogg": "un dorn",
"handlebar.ogg": "ur varrenn-stur",
"happy.ogg": "laouen",
"harp.ogg": "un delenn",
"hat.ogg": "un tok",
"hatch.ogg": "dinodiñ",
"hay.ogg": "foenn",
"head.ogg": "ur penn",
"hear.ogg": "klevout",
"heat.ogg": "ar wrez",
"hedge.ogg": "ur c'harzh",
"hedgehog.ogg": "un avalaouer",
"heel.ogg": "ur seul",
"helmet.ogg": "un tokarn",
"hen.ogg": "ur yar",
"herd.ogg": "un tropell",
"high.ogg": "uhel",
"hike.ogg": "bale",
"hill.ogg": "ur run",
"hip.ogg": "ul lez",
"hippopotamus.ogg": "un dourvarc'h",
"hit.ogg": "touchañ",
"hive.ogg": "ur ruskenn",
"hockey.ogg": "hoke",
"hole.ogg": "un toull",
"home.ogg": "ar gêr",
"hook.ogg": "ur c'hrog",
"hop.ogg": "dilammat",
"horse.ogg": "ul loen-kezeg",
"hose.ogg": "ur gorzenn",
"hospital.ogg": "un ospital",
"hot.ogg": "tomm",
"hot_dog.ogg": "un hot-dog",
"hound.ogg": "ur mell ki",
"house.ogg": "un ti",
"howl.ogg": "yudal",
"hug.ogg": "briata",
"huge.ogg": "bras tre",
"hummingbird.ogg": "ur c'holibri",
"hunchbacked.ogg": "tort",
"hunter.ogg": "ur chaseour",
"husband.ogg": "ur gwazh",
"hut.ogg": "ul loch",
"hyena.ogg": "ur bleiz-broc'h",
"ice.ogg": "skorn",
"iceberg.ogg": "ur skorngrec'h",
"iguana.ogg": "un igwan",
"ill.ogg": "klañv",
"ink.ogg": "ankr",
"island.ogg": "un enezenn",
"jacket.ogg": "ur porpant",
"jaguar.ogg": "ur jagoar",
"jam.ogg": "koñfitur",
"jay.ogg": "ur gegin",
"jelly.ogg": "kaotigell",
"jellyfish.ogg": "ur vorglaouenn",
"jewel.ogg": "ur bravig",
"job.ogg": "micherioù",
"jockey.ogg": "ur joke",
"jog.ogg": "trotadenn",
"joy.ogg": "plijadur",
"judge.ogg": "ur barner",
"judo.ogg": "judo",
"juggler.ogg": "ur janglerez",
"juice.ogg": "jug",
"jump.ogg": "lammat",
"kangaroo.ogg": "ur c'hangourou",
"keel.ogg": "kilhoù",
"kernel.ogg": "un maen",
"keyboard.ogg": "ur c'hlavier",
"kimono.ogg": "ur c'himono",
"king.ogg": "ur roue",
"kiss.ogg": "pokat",
"kitchen.ogg": "ur gegin",
"kite.ogg": "ur sarpant-nij",
"kitten.ogg": "ur c'hazhig",
"kiwi.ogg": "kiwi",
"knee.ogg": "ur glin",
"kneel.ogg": "daoulinañ",
"knife.ogg": "ur gountell",
"knight.ogg": "ur marc'heg",
"knit.ogg": "stammañ",
"knot.ogg": "ur skoulm",
"koala.ogg": "ur c'hoala",
"lad.ogg": "ur paotr",
"lady.ogg": "un itron",
"ladybug.ogg": "ur viwig",
"lake.ogg": "ul lenn",
"lama.ogg": "ul lama",
"lamb.ogg": "un oan",
"lamp.ogg": "ul lamp",
"land.ogg": "an douar",
"lane.ogg": "un hent",
"lap.ogg": "ur varlenn",
"lasso.ogg": "ul lasso",
"laugh.ogg": "c'hoarzhin",
"lava.ogg": "maen teuz",
"lawn.ogg": "ul letonenn",
"lawyer.ogg": "un avokad",
"leaf.ogg": "delioù",
"ledge.ogg": "ur rizenn",
"leek.ogg": "ur bourenn",
"left.ogg": "kleiz",
"leg.ogg": "ur c'har",
"lemon.ogg": "ur sitroñs",
"lemonade.ogg": "dour-sitroñs",
"lemur.ogg": "ul lemur",
"leopard.ogg": "ul loupard",
"lettuce.ogg": "ur saladenn",
"librarian.ogg": "ul levraouegerez",
"lick.ogg": "lipat",
"lid.ogg": "ur golo",
"lift.ogg": "sevel",
"light.ogg": "ar gouloù",
"lighthouse.ogg": "un tour-tan",
"lightning.ogg": "ar c'hurun",
"lilac.ogg": "ul lireuenn",
"lime.ogg": "ur sitroñs glas",
"line.ogg": "linennoù",
"link.ogg": "ul liamm",
"lion.ogg": "ul leon",
"lion_cub.ogg": "ul leonig",
"lip.ogg": "muzelloù",
"liquid.ogg": "dourennek",
"lizard.ogg": "ur glazard",
"lobster.ogg": "ul legestr",
"log.ogg": "ur geuneudenn",
"look.ogg": "sellout",
"lunch.ogg": "merenn",
- "mad.ogg": "ur foll",
+ "mad.ogg": "ar fulor",
"magic.ogg": "hud",
"magnet.ogg": "ur maen-touch",
"magnifying_glass.ogg": "ur werenn-greskiñ",
"magpie.ogg": "ur big",
"mail.ogg": "ul lizher",
"man.ogg": "ur gwaz",
"mane.ogg": "ur moue",
"mango.ogg": "mangez",
"map.ogg": "ur gartenn",
"maple.ogg": "ur skavenn-wrac'h",
"marble.ogg": "kanetennoù",
"mashed_potatoes.ogg": "yod patatez",
"mask.ogg": "ur maskl",
"mast.ogg": "ur wern",
"mat.ogg": "un tamm tapis",
"match.ogg": "alumetez",
"mate.ogg": "ur c'hamalad",
"mattress.ogg": "ur vatarasenn",
- "mauve.ogg": "limestra",
+ "mauve.ogg": "mouk",
"meal.ogg": "ur pred",
"meat.ogg": "kig",
"mechanic.ogg": "ur mekaniker",
"medal.ogg": "ur vedalenn",
"meet.ogg": "kejañ",
"melon.ogg": "meloñs",
"merry-go-round.ogg": "ur manej",
"mice.ogg": "logod",
"microphone.ogg": "ur mikrofon",
"milk.ogg": "laezh",
"mill.ogg": "ur vilin",
"mimosa.ogg": "mimoza",
"mirror.ogg": "ur melezour",
"mixer.ogg": "ur frikerez",
"mole.ogg": "ur c'hoz",
"mom.ogg": "ur vammig",
"moon.ogg": "al loar",
"moose.ogg": "un orignal",
"mop.ogg": "ur skubellenn",
"mosque.ogg": "ur voskeenn",
"mosquito.ogg": "ur moustik",
"mother.ogg": "ur vamm",
"motorcycle.ogg": "ur marc'h-tan",
"mountain.ogg": "ur menez",
"mouse.ogg": "ul logodenn",
"mouth.ogg": "ur genoù",
"movie.ogg": "ur film",
"mower.ogg": "un douzerez",
"mud.ogg": "fank",
"mug.ogg": "un tas bras",
"mule.ogg": "ur vulez",
"muscle.ogg": "kigennoù",
"mushroom.ogg": "ur c'habell-touseg",
"music.ogg": "sonerezh",
"musician.ogg": "ur soner",
"naked.ogg": "noazh",
"nap.ogg": "morgousket",
"navel.ogg": "ur begel",
"neck.ogg": "ur gouzoug",
"necklace.ogg": "ur c'holier",
"needle.ogg": "ur spilhenn",
"nest.ogg": "un neizh",
"net.ogg": "ur roued",
"newspaper.ogg": "ur gazetenn",
"night.ogg": "an noz",
"nightgown.ogg": "un hiviz-noz",
"nose.ogg": "ur fri",
"nostril.ogg": "ur fronell",
"notebook.ogg": "ur c'harned",
"number.ogg": "niveroù",
"nun.ogg": "ur seurez",
"nurse.ogg": "ur glañvdiourez",
"nurse_male.ogg": "ur c'hlañvdiour",
"nut.ogg": "kakaouetez",
"oar.ogg": "roeñvioù",
"ocean.ogg": "ur meurvor",
"office.ogg": "un ofis",
"olive.ogg": "olivez",
"on.ogg": "war",
"onion.ogg": "ur penn-ognon",
"open.ogg": "digor",
"opossum.ogg": "un oposom",
"orange-color.ogg": "orañjez",
- "orange.ogg": "ur orañjezenn",
+ "orange.ogg": "un orañjezenn",
"orchid.ogg": "un orkideenn",
"ostrich.ogg": "ur struskañval",
"otter.ogg": "un dourgi",
"owl.ogg": "ur gaouenn",
"ox.ogg": "un ejen",
"oyster.ogg": "un istrenn",
"pacifier.ogg": "ur chutenn",
"page.ogg": "ur bajenn",
"pair.ogg": "ur re",
"pajamas.ogg": "ur pijama",
"pal.ogg": "ur c'homper",
"palm_tree.ogg": "ur wezenn-balm",
"pan.ogg": "ur baelon",
"panda.ogg": "ur panda",
"panther.ogg": "ur banterenn",
"panties.ogg": "brageier dindan",
"pants.ogg": "ur re vragoù",
"papaya.ogg": "bapaiez",
"paper.ogg": "paper",
"parachute.ogg": "un harz-lamm",
"parakeet.ogg": "ur c'hrakperoked",
"parrot.ogg": "ur peroked",
"patch.ogg": "un dres",
"path.ogg": "ur wenojenn",
"paw.ogg": "ur pav",
"pea.ogg": "piz",
"peach.ogg": "pechez",
"peacock.ogg": "ur paun",
"peak.ogg": "ur c'hrec'h",
"pear.ogg": "per",
"pearl.ogg": "ur berlezenn",
"peck.ogg": "beketa",
"pedal.ogg": "ur bedalenn",
"pelican.ogg": "ur pelikant",
"pen.ogg": "ur stilo",
"pencil.ogg": "ur c'hreion",
"peony.ogg": "ur pivoena",
"people.ogg": "tud",
"pepper.ogg": "pepr",
"peppers.ogg": "pebr-Spagn",
"pet.ogg": "loened-ti",
"petal.ogg": "ur betalenn",
"phone.ogg": "ur pellgomzer",
"piano.ogg": "ur piano",
"picture.ogg": "un daolenn",
"pie.ogg": "un dartezenn",
"pig.ogg": "ur pemoc'h",
"pigeon.ogg": "ur pichon",
"pill.ogg": "pilulennoù",
"pillow.ogg": "ur goubenner",
"pilot.ogg": "un nijer",
"pine.ogg": "ur wezenn-bin",
"pine_cone.ogg": "un aval-pin",
"pink.ogg": "roz",
"pip.ogg": "ur splusenn",
"pipe.ogg": "ur c'horn-butun",
"piranha.ogg": "ur pirania",
"pirate.ogg": "ur mor-laer",
"pizza.ogg": "ur pizza",
"plane.ogg": "ur c'harr-nij",
"planet.ogg": "ur blanedenn",
"plant.ogg": "plant",
"plate.ogg": "un asied",
"play.ogg": "c'hoari",
"pliers.ogg": "piñsetoù",
"plow.ogg": "arat",
"plum.ogg": "prun",
"plumber.ogg": "ur plomer",
"pocket.ogg": "ur c'hodell",
"pod.ogg": "klorennoù",
"pole.ogg": "ur peul",
"police.ogg": "un archer",
"pompon.ogg": "pichourelloù",
"pond.ogg": "ur poull-dour",
"pony.ogg": "ur pone",
"pool.ogg": "ur poull-dour",
"popcorn.ogg": "popkorn",
"pope.ogg": "ur pab",
"porthole.ogg": "ul lomber",
"post.ogg": "boest al lizhiri",
"pot.ogg": "ur pod",
"potato.ogg": "patatez",
"pounce.ogg": "lammat",
"president.ogg": "ur prezidant",
"pretty.ogg": "koant",
"price.ogg": "ur priz",
"priest.ogg": "ur beleg",
"prince.ogg": "ur priñs",
"princess.ogg": "ur briñsez",
"prison.ogg": "un toull-bac'h",
"prisoner.ogg": "ur prizoniad",
"prize.ogg": "ur priz",
"pug.ogg": "un dogezig fri-du",
"pull.ogg": "sachañ",
"pullover.ogg": "ur stammenn",
"pumpkin.ogg": "ur sitrouilhezenn",
"puppy.ogg": "ur c'holen ki",
"pyramid.ogg": "ur biramidenn",
"quarrel.ogg": "tabutal",
"queen.ogg": "ur rouanez",
"question.ogg": "ur goulenn",
"quilt.ogg": "ur c'holc'hed",
"quiz.ogg": "ur c'houlennaoueg",
"rabbit.ogg": "ul lapin",
"rabbit_baby.ogg": "ul lapinig",
"race.ogg": "redadeg",
"radio.ogg": "ur skingomz",
"radish.ogg": "un irvinenn ruz",
"raft.ogg": "ur radell",
"rag.ogg": "ur bilhenn",
"rage.ogg": "ar gounnar",
"rain.ogg": "glav",
"raincoat.ogg": "ur vantell c'hlav",
"rake.ogg": "ur rastell",
"ramp.ogg": "ur savenn",
"ran.ogg": "redek",
"raspberry.ogg": "ur flamboezenn",
"rat.ogg": "ur razh",
"razor.ogg": "un aotenn",
"read.ogg": "lenn",
"red.ogg": "ruz",
"reptile.ogg": "ur stlejvil",
"rhinoceros.ogg": "ur frikorneg",
"rice.ogg": "riz",
"ride.ogg": "mont war velo",
"rifle.ogg": "ur fuzuilh",
"right.ogg": "dehoù",
"rip.ogg": "regiñ",
"rise.ogg": "sevel",
"river.ogg": "ur stêr",
"road.ogg": "un hent",
- "roast.ogg": "kig roastet",
+ "roast.ogg": "kig rostet",
"robe.ogg": "ur sae",
"robot.ogg": "ur robot",
"rock.ogg": "ur roc'h",
"rocket.ogg": "ur fuzeenn",
"rolling_pin.ogg": "ur ruilhenn",
"roof.ogg": "un doenn",
"room.ogg": "ur pezh",
"root.ogg": "ur wrizienn",
"rope.ogg": "ur gordenn",
"rose.ogg": "ur rozenn",
"round.ogg": "ront",
"rowing.ogg": "roeñvat",
"royal.ogg": "rouantel",
"rug.ogg": "un tapisig",
"run.ogg": "redek",
"sad.ogg": "trist",
"saddle.ogg": "un dibr",
"sail.ogg": "bageal",
"sailor.ogg": "ur martolod",
"salamander.ogg": "ur sourd",
"salmon.ogg": "un eog",
"sand.ogg": "traezh",
"sandals.ogg": "sandalennoù",
"sandwich.ogg": "ur sandwich",
"sash.ogg": "ur seizenn",
"sauce.ogg": "chaous",
"sausage.ogg": "chaousis",
- "scale.ogg": "ur ventel",
+ "scale.ogg": "ur bouezerez",
"scar.ogg": "ur gleizhenn",
"scare.ogg": "spontañ",
"scarf.ogg": "ur skerb",
"school.ogg": "ur skol",
"school_bag.ogg": "ur sac'h-skol",
"science.ogg": "ar skiant",
"scissors.ogg": "sizailhoù",
"scorpion.ogg": "ur c'hrug",
"scratch.ogg": "skrabañ",
"scream.ogg": "krial",
"screw.ogg": "ur viñs",
"screwdriver.ogg": "un tro-viñs",
"scribble.ogg": "skribouilhiñ",
"sea.ogg": "ar mor",
- "seat.ogg": "ur sez",
+ "seat.ogg": "un azezenn",
"see.ogg": "gwelout",
"seed.ogg": "had",
"shadow.ogg": "ur skeud",
"shake.ogg": "hejañ",
"shark.ogg": "ur rinkin",
"shave.ogg": "aotennañ",
"shed.ogg": "ur c'houdorenn",
"sheep.ogg": "un dañvad",
"shelf.ogg": "un estajerenn",
"shell.ogg": "ur grogenn",
"ship.ogg": "ul lestr",
"shirt.ogg": "ur roched",
"shoe.ogg": "ur votez",
"shoelace.ogg": "ul las",
"shop.ogg": "ur stal",
"shore.ogg": "un aod",
"short.ogg": "ur re vragoù berr",
"shovel.ogg": "ur balig",
"shower.ogg": "ur strinkerez",
"shrimp.ogg": "ur chevrenn",
"shrub.ogg": "ur vrousgwezenn",
"shut.ogg": "serret",
"shutter.ogg": "stalafioù",
"sick.ogg": "klañv",
"sidewalk.ogg": "ur riblenn",
"sign.ogg": "skritelloù",
"sing.ogg": "kanañ",
"sink.ogg": "un dar",
"sip.ogg": "lapat",
"sister.ogg": "ur c'hoar",
"sit.ogg": "azezañ",
"skate.ogg": "ur plankenn-ruilh",
"skeleton.ogg": "un eskeled",
"ski.ogg": "ski",
"skimmer.ogg": "ul loa-sil",
"skin.ogg": "ar c'hroc'hen",
"skirt.ogg": "ur vrozh",
"skunk.ogg": "ur pudask",
"sky.ogg": "an oabl",
"slam.ogg": "kas er baner",
"sled.ogg": "ul luj",
"sleep.ogg": "kousket",
"sleeve.ogg": "ur milgin",
"sleigh.ogg": "ur stlejell",
"slide.ogg": "ur ruz-revr",
"slim.ogg": "moan",
"slime.ogg": "glaour",
"slippers.ogg": "kofignonoù",
"slope.ogg": "un diribin",
"sloppy.ogg": "digempenn ",
"slot.ogg": "ur faout",
"sloth.ogg": "ur gorreg",
"slug.ogg": "ur velc'hwedenn",
"small.ogg": "bihan",
"smell.ogg": "c'hwesha",
"smile.ogg": "ur mousc'hoarzh",
"smock.ogg": "ur saro",
"smoke.ogg": "moged",
"smooch.ogg": "poketal",
"snack.ogg": "un torr-naon",
"snail.ogg": "ur maligorn",
"snake.ogg": "un naer",
"sneaker.ogg": "botoù sport",
"sniff.ogg": "ruflañ",
"snow.ogg": "erc'h",
"soap.ogg": "soavon",
"sob.ogg": "un difronk",
"sock.ogg": "ul loer",
"soldier.ogg": "ur soudard",
- "sole.ogg": "ul leizenn",
+ "sole.ogg": "ul leizhenn",
"sole_shoe.ogg": "solioù-botez",
"son.ogg": "ur mab",
"soup.ogg": "soubenn",
"spade.ogg": "ur bal",
"spaghetti.ogg": "spageti",
"spark.ogg": "ur fulenn",
"sparrow.ogg": "ur golvan",
"spatula.ogg": "ur spanell",
"speak.ogg": "komz",
"spear.ogg": "ur goaf",
"spice.ogg": "spisoù",
"spider.ogg": "ur gevnidenn",
"spider_web.ogg": "ur gwiad-kevnid",
- "spike.ogg": "un draen",
+ "spike.ogg": "drein",
"spill.ogg": "fuilhañ",
"spinach.ogg": "pinochez",
"spine.ogg": "ul livenn-gein",
"spinning_top.ogg": "un toumpi",
"splash.ogg": "strinkañ",
"splatter.ogg": "ur strinkadenn",
"sponge.ogg": "ur spoueenn",
"spool.ogg": "ur ganell",
"spoon.ogg": "ul loa",
"sport.ogg": "sport",
"spot.ogg": "pikoù",
"spray.ogg": "flistrañ",
"spread.ogg": "ledañ",
"spring.ogg": "lammat",
"spring_season.ogg": "an nevez-amzer",
"sprinkle.ogg": "poultrenniñ",
"square.ogg": "karrez",
"squash.ogg": "koulourdrez",
"squat.ogg": "kluchañ",
"squid.ogg": "ur stivelleg",
"squirrel.ogg": "ur razh-koad",
"squirt.ogg": "ur flistrer",
"stack.ogg": "ur bern",
"stage.ogg": "ul leurenn",
"staircase.ogg": "derezioù",
"stamp.ogg": "un timbr",
"stand.ogg": "chom a-sav",
"star.ogg": "ur steredenn",
"stare.ogg": "parañ e selloù",
"starfish.ogg": "ur steredenn-vor",
"steam.ogg": "an aezhenn",
"steep.ogg": "sonn",
"steeple.ogg": "ur c'hloc'hdi",
"stem.ogg": "ur gorzenn",
"step.ogg": "un derez",
"stew.ogg": "ur ragoud",
"stick.ogg": "ur vriñsenn",
"sting.ogg": "flemmañ",
"stinky.ogg": "flaerius",
"stitch.ogg": "gwriat",
"stomach.ogg": "ur stomok",
"stone.ogg": "mein",
"stop.ogg": "herzel",
"store.ogg": "ur stal",
"stove.ogg": "ur geginerez",
"straight.ogg": "eeun",
"strainer.ogg": "ur sil",
"straw.ogg": "plouzennoù",
"strawberry.ogg": "ur sivienn",
"stream.ogg": "ur red-dour",
"street.ogg": "ur straed",
"stretch.ogg": "astenn",
"string.ogg": "un neudenn",
"stripe.ogg": "ur roudenn",
"strong.ogg": "kreñv",
"student.ogg": "ur studier",
"study.ogg": "studiañ",
"stump.ogg": "ur penngos",
"sugar.ogg": "sukr",
"suit.ogg": "un abid",
"suitcase.ogg": "ur valizenn",
"summer.ogg": "an hañv",
"summit.ogg": "ur barr",
"sun.ogg": "an heol",
"swan.ogg": "un alarc'h",
"sweat.ogg": "c'hwezh",
"sweatshirt.ogg": "ur sweat-shirt",
"swim.ogg": "neuial",
"table.ogg": "un daol",
"tablecloth.ogg": "ul lienn-daol",
"tadpole.ogg": "penndologed",
"tag.ogg": "un diketenn",
"tail.ogg": "ul lost",
"tall.ogg": "bras",
"tape_measure.ogg": "ur metr-seizenn",
"taxi.ogg": "un taksi",
"teach.ogg": "kelenn",
"teacher.ogg": "ur gelennerez",
"tear.ogg": "drailhañ",
"teddy.ogg": "un nanarzh",
"teeth.ogg": "an dent",
"television.ogg": "ur skinwel",
"temple.ogg": "un templ",
"tennis.ogg": "tennis",
"tent.ogg": "un deltenn",
"text.ogg": "un destenn",
"thick.ogg": "tev",
"thief.ogg": "ul laer",
"thigh.ogg": "ur vorzhed",
"think.ogg": "prederiañ",
"thread.ogg": "un neudenn",
"throat.ogg": "ur gorzailhenn",
"throw.ogg": "bannañ",
"thumb.ogg": "ur biz-meud",
"tick.ogg": "un deureugenn",
"ticket.ogg": "un tiked",
"tiger.ogg": "un tigr",
"time.ogg": "an amzer",
"tin.ogg": "ur bok",
"tire.ogg": "ur pneu",
"tired.ogg": "skuizh",
"tissue.ogg": "paper-torch",
"to_drink.ogg": "evañ",
"toad.ogg": "un touseg",
"toaster.ogg": "ur grazerez-vara",
"toe.ogg": "ur biz-troad",
"toilet.ogg": "ar privezioù",
"tomatoe.ogg": "un domatezenn",
"tongs.ogg": "ur wask",
"tongue.ogg": "un teod",
"tool.ogg": "benvegoù",
"top.ogg": "al lein",
"torch.ogg": "ur flammerenn",
"touch.ogg": "touchañ",
"towel.ogg": "ur serviedenn",
"toy.ogg": "ur c'hoariell",
"trail.ogg": "ur riboul",
"train.ogg": "un tren",
"train_station.ogg": "ur porzh-houarn",
"trap.ogg": "un trap",
"trash.ogg": "al lastez",
"tray.ogg": "ur bladenn",
"treat.ogg": "madigoù",
"tree.ogg": "ur wezenn",
"triangle.ogg": "un tric'horn",
"tribe.ogg": "ur meuriad",
"trip.ogg": "ur veaj",
"truck.ogg": "ur c'harr-samm",
"tube.ogg": "ruz-muzelloù",
"tulip.ogg": "tulipez",
"tune.ogg": "un ton",
"turkey.ogg": "ur yar indez",
"turnip.ogg": "un irvinenn",
"turtle.ogg": "ur vaot",
"tusk.ogg": "ur skilf",
"twin_boys.ogg": "gevelled",
"twin_girls.ogg": "gevellezed",
"umbrella.ogg": "un disglavier",
"under.ogg": "dindan",
"uniform.ogg": "ul lifre",
"van.ogg": "ur sammorell",
"vapor.ogg": "aezhenn",
"vase.ogg": "ul lestr",
"vegetable.ogg": "legumaj",
"vein.ogg": "gwazhied",
"verdure.ogg": "glasvez",
"vest.ogg": "ur chupenn",
"vet.ogg": "ur mezeg loened",
"viper.ogg": "ur wiber",
"vowel.ogg": "ur vogalenn",
"vulture.ogg": "ur gup",
"wag.ogg": "fistoulat",
"walk.ogg": "bale",
"wall.ogg": "ur voger",
"walnut.ogg": "kraoñ",
"wart.ogg": "ur wenaenn",
"wash.ogg": "gwalc'hiñ",
"wasp.ogg": "ur wespedenn",
"watch.ogg": "ur montr",
"water.ogg": "dour",
"wave.ogg": "ur wagenn",
"wedding.ogg": "un eured",
"wedge.ogg": "ur genn",
"weight.ogg": "ur pouez",
"wet.ogg": "gleb",
"whale.ogg": "ur valum",
"wheat.ogg": "gwinizh",
"wheel.ogg": "ur rod",
"whisk.ogg": "ur baser",
"whisper.ogg": "mouskomz ",
"white.ogg": "gwenn",
"wide.ogg": "ledan",
"wife.ogg": "ur wreg",
"wig.ogg": "ur berukenn",
"win.ogg": "gounit",
"wind.ogg": "avel",
"window.ogg": "ur prenestr",
"window_glass.ogg": "ur werenn-brenestr",
"wing.ogg": "un askell",
"winter.ogg": "ar goañv",
"wolf.ogg": "ur bleiz",
"woman.ogg": "ur vaouez",
"wood.ogg": "koad",
"word.ogg": "ur ger",
"worker.ogg": "ul labourer",
"world.ogg": "ar bed",
"wreath.ogg": "ur gurunenn",
"wrench.ogg": "ur gwask",
"wrist.ogg": "un arzorn",
"write.ogg": "skrivañ",
"yellow.ogg": "melen",
"yogurt.ogg": "ur yaourt",
"yum.ogg": "menam",
"zebra.ogg": "ur roudenneg",
"zipper.ogg": "ur serr-prim",
"zoo.ogg": "ur zoo"
}
diff --git a/src/activities/lang/resource/content-da.json b/src/activities/lang/resource/content-da.json
new file mode 100644
index 000000000..de7984a6c
--- /dev/null
+++ b/src/activities/lang/resource/content-da.json
@@ -0,0 +1,1088 @@
+{
+ "10.ogg": "ti",
+ "11.ogg": "elleve",
+ "12.ogg": "tolv",
+ "16.ogg": "seksten",
+ "U0030.ogg": "nul",
+ "U0031.ogg": "en",
+ "U0032.ogg": "to",
+ "U0033.ogg": "tre",
+ "U0034.ogg": "fire",
+ "U0035.ogg": "fem",
+ "U0036.ogg": "seks",
+ "U0037.ogg": "syv",
+ "U0038.ogg": "otte",
+ "U0039.ogg": "ni",
+ "accountant.ogg": "revisor",
+ "ache.ogg": "smerte",
+ "acorn.ogg": "agern",
+ "actor.ogg": "skuespiller",
+ "air_horn.ogg": "lufthorn",
+ "alarmclock.ogg": "alarmklokke",
+ "alligator.ogg": "alligator",
+ "alphabet.ogg": "alfabet",
+ "anchor.ogg": "anker",
+ "angel.ogg": "engel",
+ "angry.ogg": "vred",
+ "animal.ogg": "dyr",
+ "ankle.ogg": "ankel",
+ "ant.ogg": "myre",
+ "anteater.ogg": "myresluger",
+ "antelope.ogg": "antilope",
+ "apple.ogg": "æble",
+ "apple_tree.ogg": "æbletræ",
+ "appliance.ogg": "apparat",
+ "apricot.ogg": "abrikos",
+ "arm.ogg": "arm",
+ "armchair.ogg": "lænestol",
+ "artichoke.ogg": "artiskok",
+ "artist.ogg": "kunstner",
+ "asparagus.ogg": "asparges",
+ "astronaut.ogg": "astronaut",
+ "athlete.ogg": "atlet",
+ "avocado.ogg": "avocado",
+ "ax.ogg": "økse",
+ "baby_bottle.ogg": "sutteflaske",
+ "back.ogg": "tilbage",
+ "badge.ogg": "mærke",
+ "bag.ogg": "taske",
+ "bait.ogg": "lokkemad",
+ "balance.ogg": "balance",
+ "bald.ogg": "skaldet",
+ "ball.ogg": "bold",
+ "ball_of_yarn.ogg": "kugle af garn",
+ "ball_soccer.ogg": "fodbold",
+ "ballet.ogg": "ballet",
+ "bank.ogg": "bank",
+ "banker_female.ogg": "bankansat",
+ "bark.ogg": "at gø",
+ "barn.ogg": "laden",
+ "bat.ogg": "flagermus",
+ "bath.ogg": "bad",
+ "bathing_suit.ogg": "badedragt",
+ "bay.ogg": "bugt",
+ "beach.ogg": "stranden",
+ "bean.ogg": "bønne",
+ "bear.ogg": "bjørn",
+ "beard.ogg": "skæg",
+ "beat.ogg": "at slå",
+ "beaver.ogg": "bæver",
+ "bed.ogg": "seng",
+ "bedroom.ogg": "soveværelse",
+ "bee.ogg": "bi",
+ "beetle.ogg": "bille",
+ "beg.ogg": "at tigge",
+ "behind.ogg": "bagved",
+ "bell.ogg": "bjælde",
+ "belly.ogg": "mave",
+ "bench.ogg": "bænk",
+ "bib.ogg": "hagesmæk",
+ "big.ogg": "stor",
+ "big_top.ogg": "stor top",
+ "bike.ogg": "cykel",
+ "bird.ogg": "fugl",
+ "bit.ogg": "smule",
+ "bite.ogg": "at bide",
+ "black.ogg": "sort",
+ "blackberry.ogg": "brombær",
+ "blackbird.ogg": "solsort",
+ "blade.ogg": "blade",
+ "blind.ogg": "blind",
+ "blink.ogg": "at blinke",
+ "block.ogg": "blok",
+ "blond.ogg": "blond",
+ "blue.ogg": "blå",
+ "blueberry.ogg": "blåbær",
+ "blush.ogg": "rødme",
+ "board.ogg": "bræt",
+ "boat.ogg": "båd",
+ "boil.ogg": "at koge",
+ "bolt.ogg": "bolt",
+ "bomb.ogg": "bombe",
+ "bone.ogg": "knogle",
+ "book.ogg": "bog",
+ "bookcase.ogg": "reol",
+ "bottom.ogg": "bund",
+ "box.ogg": "boksen",
+ "boxer.ogg": "bokser",
+ "boy.ogg": "dreng",
+ "braid.ogg": "fletning",
+ "brain.ogg": "hjerne",
+ "branch.ogg": "gren",
+ "bread.ogg": "brød",
+ "break.ogg": "at bryde",
+ "breast.ogg": "bryst",
+ "brick.ogg": "mursten",
+ "bricklayer.ogg": "murer",
+ "bride.ogg": "brud",
+ "bridge.ogg": "bridge",
+ "bright.ogg": "lyst",
+ "broccoli.ogg": "broccoli",
+ "brother.ogg": "bror",
+ "brown.ogg": "brun",
+ "brush.ogg": "børste",
+ "bubble.ogg": "bobbel",
+ "bucket.ogg": "spand",
+ "bud.ogg": "knop",
+ "buffalo.ogg": "bøffel",
+ "bug.ogg": "insekt",
+ "bulb.ogg": "pære",
+ "bull.ogg": "tyr",
+ "bump.ogg": "bump",
+ "bun.ogg": "bolle",
+ "bus.ogg": "bus",
+ "bush.ogg": "busk",
+ "butcher.ogg": "slagter",
+ "butter.ogg": "smør",
+ "butterfly.ogg": "sommerfugl",
+ "button.ogg": "knap",
+ "cabbage.ogg": "kål",
+ "cabin.ogg": "kabine",
+ "cacao.ogg": "kakao",
+ "cactus.ogg": "kaktus",
+ "cage.ogg": "bur",
+ "cake.ogg": "kage",
+ "call.ogg": "at ringe",
+ "camel.ogg": "kamel",
+ "camera.ogg": "kamera",
+ "camp.ogg": "lejr",
+ "can.ogg": "kande",
+ "canary.ogg": "kanariefugl",
+ "candle.ogg": "stearinlys",
+ "candy.ogg": "slik",
+ "cane.ogg": "sukkerrør",
+ "canoe.ogg": "kano",
+ "canon.ogg": "kanon",
+ "canyon.ogg": "kløft",
+ "cap.ogg": "kasket",
+ "cape.ogg": "kappe",
+ "car.ogg": "bil",
+ "carafe.ogg": "karaffel",
+ "card.ogg": "kort",
+ "carnival.ogg": "karneval",
+ "carpenter.ogg": "tømrer",
+ "carpet.ogg": "tæppe",
+ "carrot.ogg": "gulerod",
+ "cart.ogg": "kurv",
+ "cash.ogg": "kontanter",
+ "castle.ogg": "slot",
+ "cat.ogg": "kat",
+ "cat_female.ogg": "hunkat",
+ "catch.ogg": "at fange",
+ "caterpillar.ogg": "larve",
+ "cauldron.ogg": "kedel",
+ "cauliflower.ogg": "blomkål",
+ "cave.ogg": "hule",
+ "cavern.ogg": "hule",
+ "celery.ogg": "selleri",
+ "centipede.ogg": "tusindben",
+ "cereal.ogg": "korn",
+ "chain.ogg": "kæde",
+ "chair.ogg": "stol",
+ "chalk.ogg": "kridt",
+ "chameleon.ogg": "kamæleon",
+ "chandelier.ogg": "lysekrone",
+ "chat.ogg": "at snakke",
+ "cheek.ogg": "kind",
+ "cheer.ogg": "juble",
+ "cheese.ogg": "ost",
+ "chef.ogg": "chef",
+ "cherry.ogg": "kirsebær",
+ "chest.ogg": "brystet",
+ "chick.ogg": "kylling",
+ "chicken.ogg": "kylling",
+ "child.ogg": "barn",
+ "chimney.ogg": "skorsten",
+ "chimp.ogg": "chimpanse",
+ "chin.ogg": "hage",
+ "chocolate.ogg": "chokolade",
+ "chop.ogg": "at hakke",
+ "chores.ogg": "gøremål",
+ "christmas.ogg": "jul",
+ "cigar.ogg": "cigar",
+ "circus.ogg": "cirkus",
+ "city.ogg": "by",
+ "clam.ogg": "musling",
+ "clap.ogg": "at klappe",
+ "class.ogg": "klasse",
+ "claw.ogg": "klo",
+ "clay.ogg": "ler",
+ "clean.ogg": "at rengøre",
+ "cleaning_lady.ogg": "rengøringsdame",
+ "cliff.ogg": "klippe",
+ "climb.ogg": "klatre",
+ "clock.ogg": "ur",
+ "cloth.ogg": "klud",
+ "clothes_hanger.ogg": "bøjle",
+ "cloud.ogg": "sky",
+ "cloudy.ogg": "overskyet",
+ "clover.ogg": "kløver",
+ "clown.ogg": "klovn",
+ "coach.ogg": "træner",
+ "coast.ogg": "kyst",
+ "coat.ogg": "frakke",
+ "cobra.ogg": "kobraslange",
+ "coconut.ogg": "kokos",
+ "cod.ogg": "torsk",
+ "coffee.ogg": "kaffe",
+ "coin.ogg": "mønt",
+ "cold.ogg": "kolde",
+ "color.ogg": "farve",
+ "colt.ogg": "hingst",
+ "comb.ogg": "kam",
+ "cone.ogg": "kegle",
+ "cook.ogg": "at lave mad",
+ "cookie.ogg": "småkage",
+ "cork.ogg": "kork",
+ "corn.ogg": "majs",
+ "couch.ogg": "sofaen",
+ "cough.ogg": "at hoste",
+ "couple.ogg": "par",
+ "cow.ogg": "ko",
+ "cowboy.ogg": "cowboy",
+ "crab.ogg": "krabbe",
+ "cradle.ogg": "vugge",
+ "craft.ogg": "håndværk",
+ "crawl.ogg": "at kravle",
+ "crazy.ogg": "tosset",
+ "creek.ogg": "bæk",
+ "crepe.ogg": "crepe",
+ "crib.ogg": "krybbe",
+ "croak.ogg": "at kvække",
+ "crocodile.ogg": "krokodille",
+ "cross.ogg": "tværs",
+ "crow.ogg": "krage",
+ "crown.ogg": "krone",
+ "crumb.ogg": "krumme",
+ "crust.ogg": "skorpe",
+ "cry.ogg": "at græde",
+ "crystal.ogg": "krystal",
+ "cube.ogg": "terning",
+ "cucumber.ogg": "agurk",
+ "curtain.ogg": "gardin",
+ "cut.ogg": "at skære",
+ "cute.ogg": "nuttet",
+ "dad.ogg": "far",
+ "daffodil.ogg": "påskelilje",
+ "dam.ogg": "dam",
+ "dance.ogg": "dans",
+ "dandelion.ogg": "mælkebøtte",
+ "dart_board.ogg": "dartskive",
+ "deer.ogg": "hjort",
+ "den.ogg": "hule",
+ "desert.ogg": "ørkenen",
+ "desk.ogg": "skrivebord",
+ "dessert.ogg": "dessert",
+ "diamond.ogg": "diamant",
+ "dig.ogg": "at grave",
+ "dirt.ogg": "snavs",
+ "dirty.ogg": "beskidt",
+ "dish.ogg": "fad",
+ "dishcloth.ogg": "viskestykke",
+ "dive.ogg": "dykke",
+ "doctor.ogg": "læge",
+ "doe.ogg": "dyr",
+ "dog.ogg": "hund",
+ "doll.ogg": "dukke",
+ "dolphin.ogg": "delfin",
+ "domino.ogg": "domino",
+ "door.ogg": "døren",
+ "doormat.ogg": "dørmåtte",
+ "dot.ogg": "prik",
+ "doughnut.ogg": "doughnut",
+ "dove.ogg": "due",
+ "dragon.ogg": "drage",
+ "dragonfly.ogg": "guldsmed",
+ "draw.ogg": "at tegne",
+ "drawer.ogg": "skuffe",
+ "dream.ogg": "at drømme",
+ "dress.ogg": "kjole",
+ "drink.ogg": "at drikke",
+ "drip.ogg": "dryppe",
+ "drive.ogg": "at køre",
+ "drool.ogg": "at savle",
+ "drum.ogg": "trommen",
+ "dry.ogg": "at tørre",
+ "duck.ogg": "and",
+ "duck_mother.ogg": "andemor",
+ "dune.ogg": "klit",
+ "dwarf.ogg": "dværg",
+ "eagle.ogg": "ørn",
+ "ear.ogg": "øre",
+ "earth.ogg": "jorden",
+ "eat.ogg": "at spise",
+ "egg.ogg": "æg",
+ "eggplant.ogg": "aubergine",
+ "elbow.ogg": "albue",
+ "electrician.ogg": "elektriker",
+ "elk.ogg": "elg",
+ "empty.ogg": "tom",
+ "engine.ogg": "motor",
+ "engineer.ogg": "ingeniør",
+ "eraser.ogg": "viskelæder",
+ "explore.ogg": "udforske",
+ "eyelash.ogg": "øjenvippe",
+ "eyes.ogg": "øjne",
+ "face.ogg": "ansigt",
+ "fair.ogg": "fair",
+ "fairy.ogg": "fe",
+ "fall.ogg": "at falde",
+ "fall_season.ogg": "efterårssæson",
+ "family.ogg": "familie",
+ "fan.ogg": "ventilator",
+ "farm.ogg": "gård",
+ "farmer.ogg": "landmand",
+ "fat.ogg": "fed",
+ "faucet.ogg": "vandhane",
+ "fawn.ogg": "fawn",
+ "fear.ogg": "frygt",
+ "feast.ogg": "måltid",
+ "feather.ogg": "fjer",
+ "feed.ogg": "at fodre",
+ "femur.ogg": "lårbenet",
+ "fetch.ogg": "at hente",
+ "fig.ogg": "fig",
+ "fin.ogg": "finne",
+ "find.ogg": "at finde",
+ "finger.ogg": "finger",
+ "fire.ogg": "ild",
+ "fire_extinguisher.ogg": "brandslukker",
+ "fireman.ogg": "brandmand",
+ "fish.ogg": "fisk",
+ "fisherman.ogg": "fisker",
+ "fist.ogg": "knytnæve",
+ "flag.ogg": "påtegning",
+ "flame.ogg": "flamme",
+ "flamingo.ogg": "flamingo",
+ "flash.ogg": "blitz",
+ "flat.ogg": "flad",
+ "flies.ogg": "flyver",
+ "float.ogg": "at flyde",
+ "flour.ogg": "mel",
+ "flower.ogg": "blomst",
+ "fluff.ogg": "fnug",
+ "flute.ogg": "fløjte",
+ "fly.ogg": "at flyve",
+ "foam.ogg": "skum",
+ "foot.ogg": "fod",
+ "forest.ogg": "skov",
+ "fork.ogg": "gaffel",
+ "fountain.ogg": "springvand",
+ "fox.ogg": "ræv",
+ "freeze.ogg": "at fryse",
+ "friend.ogg": "ven",
+ "fries.ogg": "pommes frites",
+ "frog.ogg": "frø",
+ "front.ogg": "front",
+ "fruit.ogg": "frugt",
+ "fudge.ogg": "fudge",
+ "full.ogg": "fuld",
+ "fur.ogg": "pels",
+ "game.ogg": "spil",
+ "garage.ogg": "garage",
+ "garden.ogg": "have",
+ "garlic.ogg": "hvidløg",
+ "gem.ogg": "perle",
+ "giant.ogg": "kæmpe",
+ "gift.ogg": "gave",
+ "giraffe.ogg": "giraf",
+ "girl.ogg": "pige",
+ "glass.ogg": "glas",
+ "glasses.ogg": "briller",
+ "glove.ogg": "handske",
+ "glue.ogg": "lim",
+ "gnome.ogg": "gnom",
+ "goat.ogg": "ged",
+ "golden.ogg": "gylden",
+ "golf.ogg": "golf",
+ "goose.ogg": "gås",
+ "gorilla.ogg": "gorilla",
+ "grain.ogg": "korn",
+ "grandmother.ogg": "bedstemor",
+ "grape.ogg": "drue",
+ "grapefruit.ogg": "grapefrugt",
+ "grass.ogg": "græs",
+ "grave.ogg": "grav",
+ "gray.ogg": "grå",
+ "green.ogg": "grøn",
+ "grill.ogg": "grill",
+ "grin.ogg": "grin",
+ "ground.ogg": "overflade",
+ "growl.ogg": "at growle",
+ "guignol.ogg": "Guignol",
+ "guinea_pig.ogg": "marsvin",
+ "gum.ogg": "tyggegummi",
+ "hair.ogg": "hår",
+ "hair_dryer.ogg": "hårtørrer",
+ "half.ogg": "halvdel",
+ "ham.ogg": "skinke",
+ "hamburger.ogg": "hamburger",
+ "hammer.ogg": "hammer",
+ "hand.ogg": "hånd",
+ "handlebar.ogg": "styr",
+ "happy.ogg": "glad",
+ "harp.ogg": "harpe",
+ "hat.ogg": "hat",
+ "hatch.ogg": "at klække",
+ "hay.ogg": "hø",
+ "head.ogg": "hovede",
+ "hear.ogg": "at høre",
+ "heat.ogg": "varme",
+ "hedge.ogg": "hæk",
+ "hedgehog.ogg": "pindsvin",
+ "heel.ogg": "hæl",
+ "helmet.ogg": "hjelm",
+ "hen.ogg": "høne",
+ "herd.ogg": "flok",
+ "high.ogg": "høj",
+ "hike.ogg": "vandre",
+ "hill.ogg": "bakke",
+ "hip.ogg": "hofte",
+ "hippopotamus.ogg": "flodhest",
+ "hit.ogg": "ramme",
+ "hive.ogg": "bistade",
+ "hockey.ogg": "hockey",
+ "hole.ogg": "hul",
+ "home.ogg": "udgangsposition",
+ "hook.ogg": "krog",
+ "hop.ogg": "hop",
+ "horse.ogg": "hest",
+ "hose.ogg": "slange",
+ "hospital.ogg": "hospital",
+ "hot.ogg": "varm",
+ "hot_dog.ogg": "hotdog",
+ "hound.ogg": "jagthund",
+ "house.ogg": "house",
+ "howl.ogg": "at hyle",
+ "hug.ogg": "at kramme",
+ "huge.ogg": "enorm",
+ "hummingbird.ogg": "kolibri",
+ "hunchbacked.ogg": "pukkelryggede",
+ "hunter.ogg": "jæger",
+ "husband.ogg": "mand",
+ "hut.ogg": "hytte",
+ "hyena.ogg": "hyæne",
+ "ice.ogg": "is",
+ "iceberg.ogg": "isbjerget",
+ "iguana.ogg": "leguan",
+ "ill.ogg": "syg",
+ "ink.ogg": "blæk",
+ "island.ogg": "øen",
+ "jacket.ogg": "jakke",
+ "jaguar.ogg": "jaguar",
+ "jam.ogg": "marmelade",
+ "jay.ogg": "jay",
+ "jelly.ogg": "gele",
+ "jellyfish.ogg": "vandmænd",
+ "jewel.ogg": "juvel",
+ "job.ogg": "arbejde",
+ "jockey.ogg": "jockey",
+ "jog.ogg": "jogge",
+ "joy.ogg": "glæde",
+ "judge.ogg": "dommer",
+ "judo.ogg": "judo",
+ "juggler.ogg": "jonglør",
+ "juice.ogg": "juice",
+ "jump.ogg": "at hoppe",
+ "kangaroo.ogg": "kænguru",
+ "keel.ogg": "køl",
+ "kernel.ogg": "kerne",
+ "keyboard.ogg": "tastatur",
+ "kimono.ogg": "kimono",
+ "king.ogg": "konge",
+ "kiss.ogg": "at kysse",
+ "kitchen.ogg": "snedkerkoekken",
+ "kite.ogg": "glente",
+ "kitten.ogg": "killing",
+ "kiwi.ogg": "kiwi",
+ "knee.ogg": "knæ",
+ "kneel.ogg": "at knæle",
+ "knife.ogg": "kniv",
+ "knight.ogg": "ridder",
+ "knit.ogg": "at strikke",
+ "knot.ogg": "knude",
+ "koala.ogg": "koala",
+ "lad.ogg": "lund",
+ "lady.ogg": "dame",
+ "ladybug.ogg": "mariehøne",
+ "lake.ogg": "søen",
+ "lama.ogg": "lama",
+ "lamb.ogg": "lam",
+ "lamp.ogg": "lampe",
+ "land.ogg": "land",
+ "lane.ogg": "bane",
+ "lap.ogg": "skød",
+ "lasso.ogg": "lasso",
+ "laugh.ogg": "at grine",
+ "lava.ogg": "lava",
+ "lawn.ogg": "græsplæne",
+ "lawyer.ogg": "advokat",
+ "leaf.ogg": "vinblad",
+ "ledge.ogg": "afsats",
+ "leek.ogg": "porre",
+ "left.ogg": "venstre",
+ "leg.ogg": "ben",
+ "lemon.ogg": "citron",
+ "lemonade.ogg": "lemonade",
+ "lemur.ogg": "lemur",
+ "leopard.ogg": "leopard",
+ "lettuce.ogg": "salat",
+ "librarian.ogg": "bibliotekar",
+ "lick.ogg": "at slikke",
+ "lid.ogg": "låg",
+ "lift.ogg": "løfte",
+ "light.ogg": "lys",
+ "lighthouse.ogg": "fyrtårn",
+ "lightning.ogg": "lyn",
+ "lilac.ogg": "lilla",
+ "lime.ogg": "limefrugt",
+ "line.ogg": "linje",
+ "link.ogg": "link",
+ "lion.ogg": "løve",
+ "lion_cub.ogg": "løveunge",
+ "lip.ogg": "læbe",
+ "liquid.ogg": "flydende",
+ "lizard.ogg": "firben",
+ "lobster.ogg": "hummer",
+ "log.ogg": "log",
+ "look.ogg": "at se",
+ "lunch.ogg": "frokost",
+ "mad.ogg": "gal",
+ "magic.ogg": "magi",
+ "magnet.ogg": "magnet",
+ "magnifying_glass.ogg": "forstørrelsesglas",
+ "magpie.ogg": "husskade",
+ "mail.ogg": "post",
+ "man.ogg": "man",
+ "mane.ogg": "manke",
+ "mango.ogg": "mango",
+ "map.ogg": "kort",
+ "maple.ogg": "ahorn",
+ "marble.ogg": "marmor",
+ "mashed_potatoes.ogg": "kartoffelmos",
+ "mask.ogg": "maske",
+ "mast.ogg": "maste",
+ "mat.ogg": "måtte",
+ "match.ogg": "match",
+ "mate.ogg": "makker",
+ "mattress.ogg": "madras",
+ "mauve.ogg": "lilla",
+ "meal.ogg": "måltid",
+ "meat.ogg": "kød",
+ "mechanic.ogg": "mekaniker",
+ "medal.ogg": "medalje",
+ "meet.ogg": "at møde",
+ "melon.ogg": "melon",
+ "merry-go-round.ogg": "karrusel",
+ "mice.ogg": "mus",
+ "microphone.ogg": "mikrofon",
+ "milk.ogg": "mælk",
+ "mill.ogg": "mølle",
+ "mimosa.ogg": "mimoser",
+ "mirror.ogg": "spejl",
+ "mixer.ogg": "mixer",
+ "mole.ogg": "muldvarp",
+ "mom.ogg": "mor",
+ "moon.ogg": "månen",
+ "moose.ogg": "elg",
+ "mop.ogg": "moppe",
+ "mosque.ogg": "moské",
+ "mosquito.ogg": "myg",
+ "mother.ogg": "mor",
+ "motorcycle.ogg": "motorcykel",
+ "mountain.ogg": "bjerg",
+ "mouse.ogg": "musen",
+ "mouth.ogg": "mund",
+ "movie.ogg": "film",
+ "mower.ogg": "plæneklipperen",
+ "mud.ogg": "mudder",
+ "mug.ogg": "krus",
+ "mule.ogg": "muldyr",
+ "muscle.ogg": "muskel",
+ "mushroom.ogg": "champignon",
+ "music.ogg": "musik",
+ "musician.ogg": "musiker",
+ "naked.ogg": "nøgen",
+ "nap.ogg": "at få en lur",
+ "navel.ogg": "navle",
+ "neck.ogg": "hals",
+ "necklace.ogg": "halskæde",
+ "needle.ogg": "nål",
+ "nest.ogg": "reden",
+ "net.ogg": "nettet",
+ "newspaper.ogg": "avis",
+ "night.ogg": "nat",
+ "nightgown.ogg": "natkjole",
+ "nose.ogg": "næse",
+ "nostril.ogg": "æsebor",
+ "notebook.ogg": "notesblok",
+ "number.ogg": "tal",
+ "nun.ogg": "nonne",
+ "nurse.ogg": "sygeplejerske",
+ "nurse_male.ogg": "sygeplejerske",
+ "nut.ogg": "nød",
+ "oar.ogg": "åre",
+ "ocean.ogg": "hav",
+ "office.ogg": "kontor",
+ "olive.ogg": "oliven",
+ "on.ogg": "på",
+ "onion.ogg": "løg",
+ "open.ogg": "åben",
+ "opossum.ogg": "opossum",
+ "orange-color.ogg": "orange farve",
+ "orange.ogg": "appelsin",
+ "orchid.ogg": "orkidé",
+ "ostrich.ogg": "struds",
+ "otter.ogg": "odder",
+ "owl.ogg": "ugle",
+ "ox.ogg": "okse",
+ "oyster.ogg": "østers",
+ "pacifier.ogg": "sut",
+ "page.ogg": "side",
+ "pair.ogg": "par",
+ "pajamas.ogg": "pyjamas",
+ "pal.ogg": "kammerat",
+ "palm_tree.ogg": "palmetræ",
+ "pan.ogg": "pande",
+ "panda.ogg": "panda",
+ "panther.ogg": "panter",
+ "panties.ogg": "trusser",
+ "pants.ogg": "bukser",
+ "papaya.ogg": "papayafrugt",
+ "paper.ogg": "papir",
+ "parachute.ogg": "faldskærm",
+ "parakeet.ogg": "parakit",
+ "parrot.ogg": "papegøje",
+ "patch.ogg": "lappe",
+ "path.ogg": "sti",
+ "paw.ogg": "pote",
+ "pea.ogg": "ært",
+ "peach.ogg": "fersken",
+ "peacock.ogg": "påfugl",
+ "peak.ogg": "spids",
+ "pear.ogg": "pære",
+ "pearl.ogg": "perle",
+ "peck.ogg": "at pikke",
+ "pedal.ogg": "pedal",
+ "pelican.ogg": "pelikan",
+ "pen.ogg": "pen",
+ "pencil.ogg": "blyant",
+ "peony.ogg": "pæon",
+ "people.ogg": "personer",
+ "pepper.ogg": "peber",
+ "peppers.ogg": "peber",
+ "pet.ogg": "kæledyr",
+ "petal.ogg": "kronblad",
+ "phone.ogg": "telefon",
+ "piano.ogg": "klaver",
+ "picture.ogg": "billede",
+ "pie.ogg": "tærte",
+ "pig.ogg": "gris",
+ "pigeon.ogg": "due",
+ "pill.ogg": "pille",
+ "pillow.ogg": "pude",
+ "pilot.ogg": "pilot",
+ "pine.ogg": "fyrretræ",
+ "pine_cone.ogg": "grankogle",
+ "pink.ogg": "pink",
+ "pip.ogg": "pip",
+ "pipe.ogg": "rør",
+ "piranha.ogg": "piranha",
+ "pirate.ogg": "pirat",
+ "pizza.ogg": "pizza",
+ "plane.ogg": "høvl",
+ "planet.ogg": "planet",
+ "plant.ogg": "plante",
+ "plate.ogg": "plade",
+ "play.ogg": "at spille",
+ "pliers.ogg": "tænger",
+ "plow.ogg": "at pløje",
+ "plum.ogg": "blomme",
+ "plumber.ogg": "blikkenslager",
+ "pocket.ogg": "lomme",
+ "pod.ogg": "pod",
+ "pole.ogg": "pole",
+ "police.ogg": "politiet",
+ "pompon.ogg": "pompon",
+ "pond.ogg": "dam",
+ "pony.ogg": "pony",
+ "pool.ogg": "swimmingpool",
+ "popcorn.ogg": "popcorn",
+ "pope.ogg": "pave",
+ "porthole.ogg": "koøje",
+ "post.ogg": "indlæg",
+ "pot.ogg": "gryde",
+ "potato.ogg": "kartoffel",
+ "pounce.ogg": "at slå",
+ "president.ogg": "præsident",
+ "pretty.ogg": "køn",
+ "price.ogg": "pris",
+ "priest.ogg": "præst",
+ "prince.ogg": "prins",
+ "princess.ogg": "prinsesse",
+ "prison.ogg": "fængsel",
+ "prisoner.ogg": "fange",
+ "prize.ogg": "præmie",
+ "pug.ogg": "mops",
+ "pull.ogg": "at trække",
+ "pullover.ogg": "bluse",
+ "pumpkin.ogg": "græskar",
+ "puppy.ogg": "hvalp",
+ "pyramid.ogg": "pyramide",
+ "quarrel.ogg": "at skændes",
+ "queen.ogg": "dronning",
+ "question.ogg": "spørgsmål",
+ "quilt.ogg": "dyne",
+ "quiz.ogg": "quiz",
+ "rabbit.ogg": "kanin",
+ "rabbit_baby.ogg": "kaninunge",
+ "race.ogg": "ræse",
+ "radio.ogg": "radio",
+ "radish.ogg": "radise",
+ "raft.ogg": "tømmerflåde",
+ "rag.ogg": "klud",
+ "rage.ogg": "raseri",
+ "rain.ogg": "regn",
+ "raincoat.ogg": "regnfrakke",
+ "rake.ogg": "rive",
+ "ramp.ogg": "rampe",
+ "ran.ogg": "løb",
+ "raspberry.ogg": "hindbær",
+ "rat.ogg": "rotte",
+ "razor.ogg": "barbermaskine",
+ "read.ogg": "at læse",
+ "red.ogg": "rød",
+ "reptile.ogg": "krybdyr",
+ "rhinoceros.ogg": "næsehorn",
+ "rice.ogg": "ris",
+ "ride.ogg": "ride",
+ "rifle.ogg": "riffel",
+ "right.ogg": "højre",
+ "rip.ogg": "at rippe",
+ "rise.ogg": "at stige",
+ "river.ogg": "floden",
+ "road.ogg": "vej",
+ "roast.ogg": "stege",
+ "robe.ogg": "kåbe",
+ "robot.ogg": "robot",
+ "rock.ogg": "klippe",
+ "rocket.ogg": "raket",
+ "rolling_pin.ogg": "kagerulle",
+ "roof.ogg": "tag",
+ "room.ogg": "værelse",
+ "root.ogg": "rod",
+ "rope.ogg": "reb",
+ "rose.ogg": "rose",
+ "round.ogg": "runde",
+ "rowing.ogg": "roning",
+ "royal.ogg": "royal",
+ "rug.ogg": "tæppe",
+ "run.ogg": "at løbe",
+ "sad.ogg": "trist",
+ "saddle.ogg": "sadel",
+ "sail.ogg": "sejle",
+ "sailor.ogg": "sømand",
+ "salamander.ogg": "salamander",
+ "salmon.ogg": "laks",
+ "sand.ogg": "sand",
+ "sandals.ogg": "sandaler",
+ "sandwich.ogg": "sandwich",
+ "sash.ogg": "skærf",
+ "sauce.ogg": "sauce",
+ "sausage.ogg": "pølse",
+ "scale.ogg": "skala",
+ "scar.ogg": "ar",
+ "scare.ogg": "at skræmme",
+ "scarf.ogg": "tørklæde",
+ "school.ogg": "skole",
+ "school_bag.ogg": "skoletaske",
+ "science.ogg": "videnskab",
+ "scissors.ogg": "saks",
+ "scorpion.ogg": "skorpion",
+ "scratch.ogg": "at ridse",
+ "scream.ogg": "at skrige",
+ "screw.ogg": "skrue",
+ "screwdriver.ogg": "skruetrækker",
+ "scribble.ogg": "at skrible",
+ "sea.ogg": "havet",
+ "seat.ogg": "sæde",
+ "see.ogg": "at se",
+ "seed.ogg": "frø",
+ "shadow.ogg": "skygge",
+ "shake.ogg": "at ryste",
+ "shark.ogg": "haj",
+ "shave.ogg": "at barbere",
+ "shed.ogg": "skur",
+ "sheep.ogg": "får",
+ "shelf.ogg": "reol",
+ "shell.ogg": "skal",
+ "ship.ogg": "skib",
+ "shirt.ogg": "skjorte",
+ "shoe.ogg": "sko",
+ "shoelace.ogg": "snørebånd",
+ "shop.ogg": "shop",
+ "shore.ogg": "kysten",
+ "short.ogg": "kort",
+ "shovel.ogg": "skovl",
+ "shower.ogg": "bruser",
+ "shrimp.ogg": "reje",
+ "shrub.ogg": "busk",
+ "shut.ogg": "lukke",
+ "shutter.ogg": "lukkeren",
+ "sick.ogg": "syg",
+ "sidewalk.ogg": "fortovet",
+ "sign.ogg": "tegn",
+ "sing.ogg": "at synge",
+ "sink.ogg": "vask",
+ "sip.ogg": "at nippe",
+ "sister.ogg": "søster",
+ "sit.ogg": "at sidde",
+ "skate.ogg": "skate",
+ "skeleton.ogg": "skelet",
+ "ski.ogg": "ski",
+ "skimmer.ogg": "skimmer",
+ "skin.ogg": "hud",
+ "skirt.ogg": "nederdel",
+ "skunk.ogg": "stinkdyr",
+ "sky.ogg": "himlen",
+ "slam.ogg": "at hamre",
+ "sled.ogg": "slæde",
+ "sleep.ogg": "at sove",
+ "sleeve.ogg": "ærme",
+ "sleigh.ogg": "slæde",
+ "slide.ogg": "dias",
+ "slim.ogg": "slank",
+ "slime.ogg": "slim",
+ "slippers.ogg": "tøfler",
+ "slope.ogg": "hældning",
+ "sloppy.ogg": "sjusket",
+ "slot.ogg": "slot",
+ "sloth.ogg": "dovendyr",
+ "slug.ogg": "snegl",
+ "small.ogg": "lille",
+ "smell.ogg": "at lugte",
+ "smile.ogg": "smil",
+ "smock.ogg": "busseronne",
+ "smoke.ogg": "røg",
+ "smooch.ogg": "at kysse og kramme",
+ "snack.ogg": "snack",
+ "snail.ogg": "sneglen",
+ "snake.ogg": "slange",
+ "sneaker.ogg": "sneaker",
+ "sniff.ogg": "at sniffe",
+ "snow.ogg": "sne",
+ "soap.ogg": "sæbe",
+ "sob.ogg": "hulke",
+ "sock.ogg": "sok",
+ "soldier.ogg": "soldat",
+ "sole.ogg": "eneste",
+ "sole_shoe.ogg": "eneste sko",
+ "son.ogg": "søn",
+ "soup.ogg": "suppe",
+ "spade.ogg": "spade",
+ "spaghetti.ogg": "spaghetti",
+ "spark.ogg": "gnist",
+ "sparrow.ogg": "spurv",
+ "spatula.ogg": "spatel",
+ "speak.ogg": "at tale",
+ "spear.ogg": "spyd",
+ "spice.ogg": "krydderi",
+ "spider.ogg": "edderkop",
+ "spider_web.ogg": "edderkoppespind",
+ "spike.ogg": "pig",
+ "spill.ogg": "at spilde",
+ "spinach.ogg": "spinat",
+ "spine.ogg": "rygsøjle",
+ "spinning_top.ogg": "snurretop",
+ "splash.ogg": "at plaske",
+ "splatter.ogg": "splatter",
+ "sponge.ogg": "svamp",
+ "spool.ogg": "spole",
+ "spoon.ogg": "ske",
+ "sport.ogg": "sport",
+ "spot.ogg": "sted",
+ "spray.ogg": "at sprøjte",
+ "spread.ogg": "at sprede",
+ "spring.ogg": "til foråret",
+ "spring_season.ogg": "forårssæson",
+ "sprinkle.ogg": "stænke",
+ "square.ogg": "plads",
+ "squash.ogg": "squash",
+ "squat.ogg": "at squatte",
+ "squid.ogg": "blæksprutte",
+ "squirrel.ogg": "egern",
+ "squirt.ogg": "sprøjte",
+ "stack.ogg": "stak",
+ "stage.ogg": "fase",
+ "staircase.ogg": "trappe",
+ "stamp.ogg": "stempel",
+ "stand.ogg": "stå",
+ "star.ogg": "stjerne",
+ "stare.ogg": "at stirre",
+ "starfish.ogg": "søstjerne",
+ "steam.ogg": "damp",
+ "steep.ogg": "stejl",
+ "steeple.ogg": "spir",
+ "stem.ogg": "stilk",
+ "step.ogg": "trin",
+ "stew.ogg": "gryderet",
+ "stick.ogg": "stick (US mål)",
+ "sting.ogg": "at stikke",
+ "stinky.ogg": "stinkende",
+ "stitch.ogg": "at sy",
+ "stomach.ogg": "mave",
+ "stone.ogg": "sten",
+ "stop.ogg": "at stoppe",
+ "store.ogg": "butik",
+ "stove.ogg": "komfur",
+ "straight.ogg": "ligeud",
+ "strainer.ogg": "si",
+ "straw.ogg": "halm",
+ "strawberry.ogg": "jordbær",
+ "stream.ogg": "strøm",
+ "street.ogg": "gade",
+ "stretch.ogg": "at strække",
+ "string.ogg": "streng",
+ "stripe.ogg": "stribe",
+ "strong.ogg": "stærk",
+ "student.ogg": "studerende",
+ "study.ogg": "at studere",
+ "stump.ogg": "stub",
+ "sugar.ogg": "sukker",
+ "suit.ogg": "dragt",
+ "suitcase.ogg": "kuffert",
+ "summer.ogg": "sommer",
+ "summit.ogg": "topmødet",
+ "sun.ogg": "søn",
+ "swan.ogg": "svane",
+ "sweat.ogg": "sved",
+ "sweatshirt.ogg": "sweatshirt",
+ "swim.ogg": "svømme",
+ "table.ogg": "tabel",
+ "tablecloth.ogg": "dug",
+ "tadpole.ogg": "haletudse",
+ "tag.ogg": "etiqueta",
+ "tail.ogg": "hale",
+ "tall.ogg": "høj",
+ "tape_measure.ogg": "målebånd",
+ "taxi.ogg": "taxa",
+ "teach.ogg": "at undervise",
+ "teacher.ogg": "lærer",
+ "tear.ogg": "at rive",
+ "teddy.ogg": "bamse",
+ "teeth.ogg": "tænder",
+ "television.ogg": "tv",
+ "temple.ogg": "templet",
+ "tennis.ogg": "tennis",
+ "tent.ogg": "telt",
+ "text.ogg": "tekst",
+ "thick.ogg": "tyk",
+ "thief.ogg": "tyv",
+ "thigh.ogg": "lår",
+ "think.ogg": "at tænke",
+ "thread.ogg": "tråd",
+ "throat.ogg": "hals",
+ "throw.ogg": "smide",
+ "thumb.ogg": "tommelfinger",
+ "tick.ogg": "skovlflåt",
+ "ticket.ogg": "seddel",
+ "tiger.ogg": "tiger",
+ "time.ogg": "tid",
+ "tin.ogg": "tin",
+ "tire.ogg": "dæk",
+ "tired.ogg": "træt",
+ "tissue.ogg": "væv",
+ "to_drink.ogg": "at drikke",
+ "toad.ogg": "tudse",
+ "toaster.ogg": "brødrister",
+ "toe.ogg": "tå",
+ "toilet.ogg": "toilet",
+ "tomatoe.ogg": "tomat",
+ "tongs.ogg": "tang",
+ "tongue.ogg": "tunge",
+ "tool.ogg": "værktøj",
+ "top.ogg": "top",
+ "torch.ogg": "fakkel",
+ "touch.ogg": "at røre ved",
+ "towel.ogg": "håndklæde",
+ "toy.ogg": "legetøj",
+ "trail.ogg": "spor",
+ "train.ogg": "tog",
+ "train_station.ogg": "togstationen",
+ "trap.ogg": "fælde",
+ "trash.ogg": "urenheder",
+ "tray.ogg": "bakke",
+ "treat.ogg": "behandle",
+ "tree.ogg": "træ",
+ "triangle.ogg": "trekant",
+ "tribe.ogg": "stamme",
+ "trip.ogg": "tur",
+ "truck.ogg": "lille vogn til skinner",
+ "tube.ogg": "tube",
+ "tulip.ogg": "tulipan",
+ "tune.ogg": "justere",
+ "turkey.ogg": "gås",
+ "turnip.ogg": "majroe",
+ "turtle.ogg": "skildpadde",
+ "tusk.ogg": "stødtand",
+ "twin_boys.ogg": "tvillingedrenge",
+ "twin_girls.ogg": "tvillingepiger",
+ "umbrella.ogg": "paraply",
+ "under.ogg": "under",
+ "uniform.ogg": "uniform",
+ "van.ogg": "bil",
+ "vapor.ogg": "damp",
+ "vase.ogg": "vase",
+ "vegetable.ogg": "vegetabilsk",
+ "vein.ogg": "vene",
+ "vest.ogg": "vest",
+ "vet.ogg": "dyrlæge",
+ "viper.ogg": "hugorm",
+ "vowel.ogg": "vokal",
+ "vulture.ogg": "grib",
+ "wag.ogg": "at logre",
+ "walk.ogg": "at gå",
+ "wall.ogg": "væg",
+ "walnut.ogg": "valnød",
+ "wart.ogg": "vorte",
+ "wash.ogg": "at vaske",
+ "wasp.ogg": "hveps",
+ "watch.ogg": "se",
+ "water.ogg": "vand",
+ "wave.ogg": "bølge",
+ "wedding.ogg": "bryllup",
+ "wedge.ogg": "kile",
+ "weight.ogg": "vægt",
+ "wet.ogg": "våd",
+ "whale.ogg": "hval",
+ "wheat.ogg": "hvede",
+ "wheel.ogg": "hjul",
+ "whisk.ogg": "piskeris",
+ "whisper.ogg": "at hviske",
+ "white.ogg": "hvid",
+ "wide.ogg": "bred",
+ "wife.ogg": "kone",
+ "wig.ogg": "paryk",
+ "win.ogg": "at vinde",
+ "wind.ogg": "mind",
+ "window.ogg": "vinduet",
+ "window_glass.ogg": "vinduesglas",
+ "wing.ogg": "vinge",
+ "winter.ogg": "vinter",
+ "wolf.ogg": "ulv",
+ "woman.ogg": "kvinde",
+ "wood.ogg": "træ",
+ "word.ogg": "ord",
+ "worker.ogg": "arbejder",
+ "world.ogg": "verden",
+ "wreath.ogg": "krans",
+ "wrench.ogg": "skruenøgle",
+ "wrist.ogg": "håndled",
+ "write.ogg": "at skrive",
+ "yellow.ogg": "gul",
+ "yogurt.ogg": "yoghurt",
+ "yum.ogg": "yum",
+ "zebra.ogg": "zebra",
+ "zipper.ogg": "lynlås",
+ "zoo.ogg": "zoologisk have"
+}
diff --git a/src/activities/lang/resource/content-en.json b/src/activities/lang/resource/content-en.json
index 91e6241b6..1255e48e6 100644
--- a/src/activities/lang/resource/content-en.json
+++ b/src/activities/lang/resource/content-en.json
@@ -1,1093 +1,1092 @@
{
"10.ogg": "ten",
"11.ogg": "eleven",
"12.ogg": "twelve",
"16.ogg": "sixteen",
"U0030.ogg": "zero",
"U0031.ogg": "one",
"U0032.ogg": "two",
"U0033.ogg": "three",
"U0034.ogg": "four",
"U0035.ogg": "five",
"U0036.ogg": "six",
"U0037.ogg": "seven",
"U0038.ogg": "eight",
"U0039.ogg": "nine",
- "accountant.ogg": "",
- "ache.ogg": "",
- "acorn.ogg": "",
- "actor.ogg": "",
- "air_horn.ogg": "",
- "alarmclock.ogg": "",
+ "accountant.ogg": "accountant",
+ "ache.ogg": "ache",
+ "acorn.ogg": "acorn",
+ "actor.ogg": "actor",
+ "air_horn.ogg": "air horn",
+ "alarmclock.ogg": "alarmclock",
"alligator.ogg": "alligator",
- "alphabet.ogg": "",
+ "alphabet.ogg": "alphabet",
"anchor.ogg": "anchor",
"angel.ogg": "angel",
- "angry.ogg": "",
+ "angry.ogg": "angry",
"animal.ogg": "animal",
- "ankle.ogg": "",
- "ant.ogg": "",
- "anteater.ogg": "",
- "antelope.ogg": "",
- "apple.ogg": "",
- "apple_tree.ogg": "",
- "appliance.ogg": "",
- "apricot.ogg": "",
- "arm.ogg": "",
- "armchair.ogg": "",
- "artichoke.ogg": "",
- "artist.ogg": "",
- "asparagus.ogg": "",
- "astronaut.ogg": "",
+ "ankle.ogg": "ankle",
+ "ant.ogg": "ant",
+ "anteater.ogg": "anteater",
+ "antelope.ogg": "antelope",
+ "apple.ogg": "apple",
+ "apple_tree.ogg": "apple tree",
+ "appliance.ogg": "appliance",
+ "apricot.ogg": "apricot",
+ "arm.ogg": "arm",
+ "armchair.ogg": "armchair",
+ "artichoke.ogg": "artichoke",
+ "artist.ogg": "artist",
+ "asparagus.ogg": "asparagus",
+ "astronaut.ogg": "astronaut",
"athlete.ogg": "athlete",
- "avocado.ogg": "",
- "ax.ogg": "",
- "baby_bottle.ogg": "",
+ "avocado.ogg": "avocado",
+ "ax.ogg": "ax",
+ "baby_bottle.ogg": "baby bottle",
"back.ogg": "back",
"badge.ogg": "badge",
"bag.ogg": "bag",
"bait.ogg": "bait",
"balance.ogg": "balance",
- "bald.ogg": "",
+ "bald.ogg": "bald",
"ball.ogg": "ball",
- "ball_of_yarn.ogg": "",
- "ball_soccer.ogg": "",
+ "ball_of_yarn.ogg": "ball of yarn",
+ "ball_soccer.ogg": "soccer ball",
"ballet.ogg": "ballet",
"bank.ogg": "bank",
- "bark.ogg": "bark",
+ "banker_female.ogg": "female banker",
+ "bark.ogg": "to bark",
"barn.ogg": "barn",
"bat.ogg": "bat",
"bath.ogg": "bath",
- "bathing_suit.ogg": "",
+ "bathing_suit.ogg": "bathing suit",
"bay.ogg": "bay",
"beach.ogg": "beach",
- "bean.ogg": "",
- "bear.ogg": "",
- "beard.ogg": "",
- "beat.ogg": "",
- "beaver.ogg": "",
+ "bean.ogg": "bean",
+ "bear.ogg": "bear",
+ "beard.ogg": "beard",
+ "beat.ogg": "to beat",
+ "beaver.ogg": "beaver",
"bed.ogg": "bed",
- "bedroom.ogg": "",
+ "bedroom.ogg": "bedroom",
"bee.ogg": "bee",
"beetle.ogg": "beetle",
- "beg.ogg": "beg",
- "behind.ogg": "",
- "bell.ogg": "",
- "belly.ogg": "",
+ "beg.ogg": "to beg",
+ "behind.ogg": "behind",
+ "bell.ogg": "bell",
+ "belly.ogg": "belly",
"bench.ogg": "bench",
"bib.ogg": "bib",
"big.ogg": "big",
- "big_top.ogg": "",
+ "big_top.ogg": "big top",
"bike.ogg": "bike",
"bird.ogg": "bird",
"bit.ogg": "bit",
- "bite.ogg": "bite",
+ "bite.ogg": "to bite",
"black.ogg": "black",
- "blackberry.ogg": "",
- "blackbird.ogg": "",
- "blade.ogg": "",
+ "blackberry.ogg": "blackberry",
+ "blackbird.ogg": "blackbird",
+ "blade.ogg": "blade",
"blind.ogg": "blind",
- "blink.ogg": "blink",
+ "blink.ogg": "to blink",
"block.ogg": "block",
"blond.ogg": "blond",
"blue.ogg": "blue",
- "blueberry.ogg": "",
- "blush.ogg": "",
+ "blueberry.ogg": "blueberry",
+ "blush.ogg": "blush",
"board.ogg": "board",
"boat.ogg": "boat",
- "boil.ogg": "boil",
- "bolt.ogg": "",
+ "boil.ogg": "to boil",
+ "bolt.ogg": "bolt",
"bomb.ogg": "bomb",
"bone.ogg": "bone",
"book.ogg": "book",
- "bookcase.ogg": "",
- "bottom.ogg": "",
+ "bookcase.ogg": "bookcase",
+ "bottom.ogg": "bottom",
"box.ogg": "box",
- "boxer.ogg": "",
+ "boxer.ogg": "boxer",
"boy.ogg": "boy",
"braid.ogg": "braid",
"brain.ogg": "brain",
"branch.ogg": "branch",
"bread.ogg": "bread",
- "break.ogg": "break",
- "breast.ogg": "",
+ "break.ogg": "to break",
+ "breast.ogg": "breast",
"brick.ogg": "brick",
- "bricklayer.ogg": "",
+ "bricklayer.ogg": "bricklayer",
"bride.ogg": "bride",
"bridge.ogg": "bridge",
"bright.ogg": "bright",
- "broccoli.ogg": "",
+ "broccoli.ogg": "broccoli",
"brother.ogg": "brother",
"brown.ogg": "brown",
"brush.ogg": "brush",
- "bubble.ogg": "",
- "bucket.ogg": "",
+ "bubble.ogg": "bubble",
+ "bucket.ogg": "bucket",
"bud.ogg": "bud",
- "buffalo.ogg": "",
+ "buffalo.ogg": "buffalo",
"bug.ogg": "bug",
- "bulb.ogg": "",
- "bull.ogg": "",
+ "bulb.ogg": "bulb",
+ "bull.ogg": "bull",
"bump.ogg": "bump",
"bun.ogg": "bun",
- "bus.ogg": "",
+ "bus.ogg": "bus",
"bush.ogg": "bush",
- "butcher.ogg": "",
- "butter.ogg": "",
- "butterfly.ogg": "",
- "button.ogg": "",
- "cabbage.ogg": "",
+ "butcher.ogg": "butcher",
+ "butter.ogg": "butter",
+ "butterfly.ogg": "butterfly",
+ "button.ogg": "button",
+ "cabbage.ogg": "cabbage",
"cabin.ogg": "cabin",
- "cacao.ogg": "",
- "cactus.ogg": "",
+ "cacao.ogg": "cacao",
+ "cactus.ogg": "cactus",
"cage.ogg": "cage",
"cake.ogg": "cake",
- "call.ogg": "call",
+ "call.ogg": "to call",
"camel.ogg": "camel",
- "camera.ogg": "",
+ "camera.ogg": "camera",
"camp.ogg": "camp",
"can.ogg": "can",
- "canary.ogg": "",
+ "canary.ogg": "canary",
"candle.ogg": "candle",
"candy.ogg": "candy",
"cane.ogg": "cane",
"canoe.ogg": "canoe",
- "canon.ogg": "",
- "canyon.ogg": "",
+ "canon.ogg": "canon",
+ "canyon.ogg": "canyon",
"cap.ogg": "cap",
"cape.ogg": "cape",
"car.ogg": "car",
- "carafe.ogg": "",
+ "carafe.ogg": "carafe",
"card.ogg": "card",
- "carnival.ogg": "",
- "carpenter.ogg": "",
- "carpet.ogg": "",
+ "carnival.ogg": "carnival",
+ "carpenter.ogg": "carpenter",
+ "carpet.ogg": "carpet",
"carrot.ogg": "carrot",
"cart.ogg": "cart",
"cash.ogg": "cash",
"castle.ogg": "castle",
"cat.ogg": "cat",
- "cat_female.ogg": "",
- "catch.ogg": "catch",
- "caterpillar.ogg": "",
- "cauldron.ogg": "",
- "cauliflower.ogg": "",
+ "cat_female.ogg": "female cat",
+ "catch.ogg": "to catch",
+ "caterpillar.ogg": "caterpillar",
+ "cauldron.ogg": "cauldron",
+ "cauliflower.ogg": "cauliflower",
"cave.ogg": "cave",
- "cavern.ogg": "",
- "celery.ogg": "",
+ "cavern.ogg": "cavern",
+ "celery.ogg": "celery",
"centipede.ogg": "centipede",
- "cereal.ogg": "",
- "chain.ogg": "",
+ "cereal.ogg": "cereal",
+ "chain.ogg": "chain",
"chair.ogg": "chair",
"chalk.ogg": "chalk",
- "chameleon.ogg": "",
- "chandelier.ogg": "",
- "chat.ogg": "chat",
- "cheek.ogg": "",
+ "chameleon.ogg": "chameleon",
+ "chandelier.ogg": "chandelier",
+ "chat.ogg": "to chat",
+ "cheek.ogg": "cheek",
"cheer.ogg": "cheer",
"cheese.ogg": "cheese",
- "chef.ogg": "",
+ "chef.ogg": "chef",
"cherry.ogg": "cherry",
"chest.ogg": "chest",
"chick.ogg": "chick",
"chicken.ogg": "chicken",
"child.ogg": "child",
- "chimney.ogg": "",
+ "chimney.ogg": "chimney",
"chimp.ogg": "chimp",
"chin.ogg": "chin",
"chocolate.ogg": "chocolate",
- "chop.ogg": "chop",
- "chore.ogg": "",
- "christmas.ogg": "",
- "cigar.ogg": "",
- "circus.ogg": "",
- "city.ogg": "",
+ "chop.ogg": "to chop",
+ "chores.ogg": "chores",
+ "christmas.ogg": "christmas",
+ "cigar.ogg": "cigar",
+ "circus.ogg": "circus",
+ "city.ogg": "city",
"clam.ogg": "clam",
- "clap.ogg": "clap",
+ "clap.ogg": "to clap",
"class.ogg": "class",
"claw.ogg": "claw",
"clay.ogg": "clay",
- "clean.ogg": "clean",
- "cleaning_lady.ogg": "",
+ "clean.ogg": "to clean",
+ "cleaning_lady.ogg": "cleaning lady",
"cliff.ogg": "cliff",
"climb.ogg": "climb",
"clock.ogg": "clock",
"cloth.ogg": "cloth",
- "clothes_hanger.ogg": "",
+ "clothes_hanger.ogg": "clothes hanger",
"cloud.ogg": "cloud",
- "cloudy.ogg": "",
- "clover.ogg": "",
+ "cloudy.ogg": "cloudy",
+ "clover.ogg": "clover",
"clown.ogg": "clown",
"coach.ogg": "coach",
- "coast.ogg": "",
+ "coast.ogg": "coast",
"coat.ogg": "coat",
- "cobra.ogg": "",
- "coconut.ogg": "",
- "cod.ogg": "",
- "coffee.ogg": "",
+ "cobra.ogg": "cobra",
+ "coconut.ogg": "coconut",
+ "cod.ogg": "cod",
+ "coffee.ogg": "coffee",
"coin.ogg": "coin",
"cold.ogg": "cold",
- "color.ogg": "color",
- "colt.ogg": "",
+ "color.ogg": "colour",
+ "colt.ogg": "colt",
"comb.ogg": "comb",
"cone.ogg": "cone",
- "cook.ogg": "",
+ "cook.ogg": "to cook",
"cookie.ogg": "cookie",
- "cork.ogg": "",
+ "cork.ogg": "cork",
"corn.ogg": "corn",
"couch.ogg": "couch",
- "cough.ogg": "",
- "couple.ogg": "",
+ "cough.ogg": "to cough",
+ "couple.ogg": "couple",
"cow.ogg": "cow",
"cowboy.ogg": "cowboy",
"crab.ogg": "crab",
- "cradle.ogg": "",
- "craft.ogg": "",
- "crawl.ogg": "crawl",
+ "cradle.ogg": "cradle",
+ "craft.ogg": "craft",
+ "crawl.ogg": "to crawl",
"crazy.ogg": "crazy",
- "creek.ogg": "",
- "crepe.ogg": "",
+ "creek.ogg": "creek",
+ "crepe.ogg": "crepe",
"crib.ogg": "crib",
- "croak.ogg": "croak",
+ "croak.ogg": "to croak",
"crocodile.ogg": "crocodile",
- "cross.ogg": "",
+ "cross.ogg": "cross",
"crow.ogg": "crow",
"crown.ogg": "crown",
"crumb.ogg": "crumb",
"crust.ogg": "crust",
- "cry.ogg": "cry",
- "crystal.ogg": "",
+ "cry.ogg": "to cry",
+ "crystal.ogg": "crystal",
"cube.ogg": "cube",
"cucumber.ogg": "cucumber",
- "curtain.ogg": "",
- "cut.ogg": "cut",
+ "curtain.ogg": "curtain",
+ "cut.ogg": "to cut",
"cute.ogg": "cute",
"dad.ogg": "dad",
- "daffodil.ogg": "",
- "daisy.ogg": "",
- "dam.ogg": "",
+ "daffodil.ogg": "daffodil",
+ "daisy.ogg": "daisy",
+ "dam.ogg": "dam",
"dance.ogg": "dance",
- "dandelion.ogg": "",
- "dark.ogg": "",
- "dart_board.ogg": "",
- "date_fruit.ogg": "",
- "deer.ogg": "",
+ "dandelion.ogg": "dandelion",
+ "dart_board.ogg": "dart board",
+ "date_fruit.ogg": "date fruit",
+ "deer.ogg": "deer",
"den.ogg": "den",
- "desert.ogg": "",
+ "desert.ogg": "desert",
"desk.ogg": "desk",
- "dessert.ogg": "",
- "diamond.ogg": "",
- "dig.ogg": "dig",
+ "dessert.ogg": "dessert",
+ "diamond.ogg": "diamond",
+ "dig.ogg": "to dig",
"dirt.ogg": "dirt",
"dirty.ogg": "dirty",
"dish.ogg": "dish",
- "dishcloth.ogg": "",
+ "dishcloth.ogg": "dishcloth",
"dive.ogg": "dive",
- "doctor.ogg": "",
- "doe.ogg": "",
+ "doctor.ogg": "doctor",
+ "doe.ogg": "doe",
"dog.ogg": "dog",
- "doll.ogg": "",
- "dolphin.ogg": "",
- "domino.ogg": "",
+ "doll.ogg": "doll",
+ "dolphin.ogg": "dolphin",
+ "domino.ogg": "domino",
"door.ogg": "door",
- "doormat.ogg": "",
+ "doormat.ogg": "doormat",
"dot.ogg": "dot",
- "doughnut.ogg": "",
- "dove.ogg": "",
+ "doughnut.ogg": "doughnut",
+ "dove.ogg": "dove",
"dragon.ogg": "dragon",
- "dragonfly.ogg": "",
- "draw.ogg": "draw",
- "drawer.ogg": "",
- "dream.ogg": "dream",
+ "dragonfly.ogg": "dragonfly",
+ "draw.ogg": "to draw",
+ "drawer.ogg": "drawer",
+ "dream.ogg": "to dream",
"dress.ogg": "dress",
"drink.ogg": "drink",
- "drip.ogg": "",
- "drive.ogg": "drive",
- "drool.ogg": "drool",
+ "drip.ogg": "drip",
+ "drive.ogg": "to drive",
+ "drool.ogg": "to drool",
"drum.ogg": "drum",
- "dry.ogg": "dry",
+ "dry.ogg": "to dry",
"duck.ogg": "duck",
- "duck_mother.ogg": "",
+ "duck_mother.ogg": "duck mother",
"dune.ogg": "dune",
- "dwarf.ogg": "",
- "eagle.ogg": "",
+ "dwarf.ogg": "dwarf",
+ "eagle.ogg": "eagle",
"ear.ogg": "ear",
"earth.ogg": "earth",
- "eat.ogg": "eat",
- "egg.ogg": "",
- "eggplant.ogg": "",
- "elbow.ogg": "",
- "electrician.ogg": "",
- "elk.ogg": "",
+ "eat.ogg": "to eat",
+ "egg.ogg": "egg",
+ "eggplant.ogg": "eggplant",
+ "elbow.ogg": "elbow",
+ "electrician.ogg": "electrician",
+ "elk.ogg": "elk",
"empty.ogg": "empty",
- "engine.ogg": "",
- "engineer.ogg": "",
- "eraser.ogg": "",
+ "engine.ogg": "engine",
+ "engineer.ogg": "engineer",
+ "eraser.ogg": "eraser",
"explore.ogg": "explore",
- "eyelash.ogg": "",
- "eyes.ogg": "",
+ "eyelash.ogg": "eyelash",
+ "eyes.ogg": "eyes",
"face.ogg": "face",
"fair.ogg": "fair",
- "fairy.ogg": "",
- "fall.ogg": "",
- "fall_season.ogg": "",
- "family.ogg": "",
+ "fairy.ogg": "fairy",
+ "fall.ogg": "to fall",
+ "fall_season.ogg": "fall season",
+ "family.ogg": "family",
"fan.ogg": "fan",
"farm.ogg": "farm",
- "farmer.ogg": "",
+ "farmer.ogg": "farmer",
"fat.ogg": "fat",
- "faucet.ogg": "",
- "fawn.ogg": "",
+ "faucet.ogg": "faucet",
+ "fawn.ogg": "fawn",
"fear.ogg": "fear",
"feast.ogg": "feast",
- "feather.ogg": "",
- "feed.ogg": "",
- "femur.ogg": "",
- "fetch.ogg": "fetch",
- "fig.ogg": "",
+ "feather.ogg": "feather",
+ "feed.ogg": "to feed",
+ "femur.ogg": "femur",
+ "fetch.ogg": "to fetch",
+ "fig.ogg": "fig",
"fin.ogg": "fin",
- "find.ogg": "find",
- "finger.ogg": "",
+ "find.ogg": "to find",
+ "finger.ogg": "finger",
"fire.ogg": "fire",
- "fire_extinguisher.ogg": "",
- "fireman.ogg": "",
+ "fire_extinguisher.ogg": "fire extinguisher",
+ "fireman.ogg": "fireman",
"fish.ogg": "fish",
- "fisherman.ogg": "",
+ "fisherman.ogg": "fisherman",
"fist.ogg": "fist",
- "flacon.ogg": "",
+ "flacon.ogg": "flacon",
"flag.ogg": "flag",
"flame.ogg": "flame",
- "flamingo.ogg": "",
+ "flamingo.ogg": "flamingo",
"flash.ogg": "flash",
"flat.ogg": "flat",
"flies.ogg": "flies",
- "float.ogg": "float",
+ "float.ogg": "to float",
"flour.ogg": "flour",
"flower.ogg": "flower",
- "fluff.ogg": "",
+ "fluff.ogg": "fluff",
"flute.ogg": "flute",
- "fly.ogg": "fly",
- "foam.ogg": "",
+ "fly.ogg": "to fly",
+ "foam.ogg": "foam",
"foot.ogg": "foot",
- "forest.ogg": "",
+ "forest.ogg": "forest",
"fork.ogg": "fork",
"fountain.ogg": "fountain",
"fox.ogg": "fox",
- "freeze.ogg": "freeze",
+ "freeze.ogg": "to freeze",
"friend.ogg": "friend",
- "fries.ogg": "",
+ "fries.ogg": "fries",
"frog.ogg": "frog",
"front.ogg": "front",
"fruit.ogg": "fruit",
"fudge.ogg": "fudge",
"full.ogg": "full",
"fur.ogg": "fur",
"game.ogg": "game",
- "garage.ogg": "",
+ "garage.ogg": "garage",
"garden.ogg": "garden",
- "garlic.ogg": "",
+ "garlic.ogg": "garlic",
"gem.ogg": "gem",
"giant.ogg": "giant",
"gift.ogg": "gift",
"giraffe.ogg": "giraffe",
"girl.ogg": "girl",
"glass.ogg": "glass",
- "glasses.ogg": "",
+ "glasses.ogg": "glasses",
"glove.ogg": "glove",
"glue.ogg": "glue",
"gnome.ogg": "gnome",
"goat.ogg": "goat",
- "golden.ogg": "",
- "golf.ogg": "",
- "goose.ogg": "",
- "gorilla.ogg": "",
- "grain.ogg": "",
- "grandmother.ogg": "",
- "grape.ogg": "",
- "grapefruit.ogg": "",
+ "golden.ogg": "golden",
+ "golf.ogg": "golf",
+ "goose.ogg": "goose",
+ "gorilla.ogg": "gorilla",
+ "grain.ogg": "grain",
+ "grandmother.ogg": "grandmother",
+ "grape.ogg": "grape",
+ "grapefruit.ogg": "grapefruit",
"grass.ogg": "grass",
"grave.ogg": "grave",
"gray.ogg": "gray",
"green.ogg": "green",
- "grill.ogg": "",
+ "grill.ogg": "grill",
"grin.ogg": "grin",
"ground.ogg": "ground",
- "growl.ogg": "growl",
- "guignol.ogg": "",
- "guinea_pig.ogg": "",
+ "growl.ogg": "to growl",
+ "guignol.ogg": "guignol",
+ "guinea_pig.ogg": "guinea pig",
"gum.ogg": "gum",
"hair.ogg": "hair",
- "hair_dryer.ogg": "",
- "half.ogg": "",
- "ham.ogg": "",
- "hamburger.ogg": "",
- "hammer.ogg": "",
+ "hair_dryer.ogg": "hair-dryer",
+ "half.ogg": "half",
+ "ham.ogg": "ham",
+ "hamburger.ogg": "hamburger",
+ "hammer.ogg": "hammer",
"hand.ogg": "hand",
- "handlebar.ogg": "",
+ "handlebar.ogg": "handlebar",
"happy.ogg": "happy",
- "harp.ogg": "",
+ "harp.ogg": "harp",
"hat.ogg": "hat",
- "hatch.ogg": "hatch",
+ "hatch.ogg": "to hatch",
"hay.ogg": "hay",
"head.ogg": "head",
- "hear.ogg": "hear",
+ "hear.ogg": "to hear",
"heat.ogg": "heat",
"hedge.ogg": "hedge",
- "hedgehog.ogg": "",
- "heel.ogg": "",
- "helmet.ogg": "",
+ "hedgehog.ogg": "hedgehog",
+ "heel.ogg": "heel",
+ "helmet.ogg": "helmet",
"hen.ogg": "hen",
"herd.ogg": "herd",
"high.ogg": "high",
"hike.ogg": "hike",
- "hill.ogg": "",
+ "hill.ogg": "hill",
"hip.ogg": "hip",
- "hippopotamus.ogg": "",
+ "hippopotamus.ogg": "hippopotamus",
"hit.ogg": "hit",
- "hive.ogg": "",
- "hockey.ogg": "",
+ "hive.ogg": "hive",
+ "hockey.ogg": "hockey",
"hole.ogg": "hole",
"home.ogg": "home",
"hook.ogg": "hook",
"hop.ogg": "hop",
- "horse.ogg": "",
+ "horse.ogg": "horse",
"hose.ogg": "hose",
- "hospital.ogg": "",
+ "hospital.ogg": "hospital",
"hot.ogg": "hot",
- "hot_dog.ogg": "",
+ "hot_dog.ogg": "hot dog",
"hound.ogg": "hound",
- "house.ogg": "",
- "howl.ogg": "howl",
- "hug.ogg": "hug",
+ "house.ogg": "house",
+ "howl.ogg": "to howl",
+ "hug.ogg": "to hug",
"huge.ogg": "huge",
- "hummingbird.ogg": "",
- "hunchbacked.ogg": "",
+ "hummingbird.ogg": "hummingbird",
+ "hunchbacked.ogg": "hunchbacked",
"hunter.ogg": "hunter",
- "husband.ogg": "",
+ "husband.ogg": "husband",
"hut.ogg": "hut",
- "hyena.ogg": "",
+ "hyena.ogg": "hyena",
"ice.ogg": "ice",
- "iceberg.ogg": "",
- "iguana.ogg": "",
- "ill.ogg": "",
+ "iceberg.ogg": "iceberg",
+ "iguana.ogg": "iguana",
+ "ill.ogg": "ill",
"ink.ogg": "ink",
- "island.ogg": "",
- "jacket.ogg": "",
- "jaguar.ogg": "",
- "jam.ogg": "",
- "jay.ogg": "",
- "jelly.ogg": "",
- "jellyfish.ogg": "",
+ "island.ogg": "island",
+ "jacket.ogg": "jacket",
+ "jaguar.ogg": "jaguar",
+ "jam.ogg": "jam",
+ "jay.ogg": "jay",
+ "jelly.ogg": "jelly",
+ "jellyfish.ogg": "jellyfish",
"jewel.ogg": "jewel",
- "job.ogg": "",
- "jockey.ogg": "",
+ "job.ogg": "job",
+ "jockey.ogg": "jockey",
"jog.ogg": "jog",
- "joy.ogg": "",
+ "joy.ogg": "joy",
"judge.ogg": "judge",
- "judo.ogg": "",
- "juggler.ogg": "",
+ "judo.ogg": "judo",
+ "juggler.ogg": "juggler",
"juice.ogg": "juice",
- "jump.ogg": "jump",
- "kangaroo.ogg": "",
- "keel.ogg": "",
- "kernel.ogg": "",
- "keyboard.ogg": "",
- "kimono.ogg": "",
- "king.ogg": "",
- "kiss.ogg": "",
- "kitchen.ogg": "",
+ "jump.ogg": "to jump",
+ "kangaroo.ogg": "kangaroo",
+ "keel.ogg": "keel",
+ "kernel.ogg": "kernel",
+ "keyboard.ogg": "keyboard",
+ "kimono.ogg": "kimono",
+ "king.ogg": "king",
+ "kiss.ogg": "to kiss",
+ "kitchen.ogg": "kitchen",
"kite.ogg": "kite",
- "kitten.ogg": "",
- "kiwi.ogg": "",
+ "kitten.ogg": "kitten",
+ "kiwi.ogg": "kiwi",
"knee.ogg": "knee",
- "kneel.ogg": "kneel",
+ "kneel.ogg": "to kneel",
"knife.ogg": "knife",
"knight.ogg": "knight",
- "knit.ogg": "knit",
+ "knit.ogg": "to knit",
"knot.ogg": "knot",
- "koala.ogg": "",
+ "koala.ogg": "koala",
"lad.ogg": "lad",
- "lady.ogg": "",
- "ladybug.ogg": "",
+ "lady.ogg": "lady",
+ "ladybug.ogg": "ladybug",
"lake.ogg": "lake",
- "lama.ogg": "",
+ "lama.ogg": "lama",
"lamb.ogg": "lamb",
"lamp.ogg": "lamp",
"land.ogg": "land",
"lane.ogg": "lane",
"lap.ogg": "lap",
- "lasso.ogg": "",
- "laugh.ogg": "",
- "lava.ogg": "",
+ "lasso.ogg": "lasso",
+ "laugh.ogg": "to laugh",
+ "lava.ogg": "lava",
"lawn.ogg": "lawn",
- "lawyer.ogg": "",
- "leaf.ogg": "",
+ "lawyer.ogg": "lawyer",
+ "leaf.ogg": "leaf",
"ledge.ogg": "ledge",
- "leek.ogg": "",
+ "leek.ogg": "leek",
"left.ogg": "left",
- "leg.ogg": "",
- "lemon.ogg": "",
- "lemonade.ogg": "",
- "lemur.ogg": "",
- "leopard.ogg": "",
- "lettuce.ogg": "",
- "librarian.ogg": "",
- "lick.ogg": "lick",
+ "leg.ogg": "leg",
+ "lemon.ogg": "lemon",
+ "lemonade.ogg": "lemonade",
+ "lemur.ogg": "lemur",
+ "leopard.ogg": "leopard",
+ "lettuce.ogg": "lettuce",
+ "librarian.ogg": "librarian",
+ "lick.ogg": "to lick",
"lid.ogg": "lid",
"lift.ogg": "lift",
"light.ogg": "light",
- "lighthouse.ogg": "",
- "lightning.ogg": "",
- "lilac.ogg": "",
+ "lighthouse.ogg": "lighthouse",
+ "lightning.ogg": "lightning",
+ "lilac.ogg": "lilac",
"lime.ogg": "lime",
"line.ogg": "line",
"link.ogg": "link",
- "lion.ogg": "",
- "lion_cub.ogg": "",
+ "lion.ogg": "lion",
+ "lion_cub.ogg": "lion cub",
"lip.ogg": "lip",
"liquid.ogg": "liquid",
- "lizard.ogg": "",
- "lobster.ogg": "",
+ "lizard.ogg": "lizard",
+ "lobster.ogg": "lobster",
"log.ogg": "log",
- "look.ogg": "look",
+ "look.ogg": "to look",
"lunch.ogg": "lunch",
"mad.ogg": "mad",
"magic.ogg": "magic",
- "magnet.ogg": "",
- "magnifying_glass.ogg": "",
- "magpie.ogg": "",
- "mail.ogg": "",
- "man.ogg": "",
+ "magnet.ogg": "magnet",
+ "magnifying_glass.ogg": "magnifying glass",
+ "magpie.ogg": "magpie",
+ "mail.ogg": "mail",
+ "man.ogg": "man",
"mane.ogg": "mane",
- "mango.ogg": "",
+ "mango.ogg": "mango",
"map.ogg": "map",
- "maple.ogg": "",
- "marble.ogg": "",
- "mashed_potatoes.ogg": "",
+ "maple.ogg": "maple",
+ "marble.ogg": "marble",
+ "mashed_potatoes.ogg": "mashed potatoes",
"mask.ogg": "mask",
- "mast.ogg": "",
+ "mast.ogg": "mast",
"mat.ogg": "mat",
"match.ogg": "match",
"mate.ogg": "mate",
- "mattress.ogg": "",
- "mauve.ogg": "",
- "meal.ogg": "",
- "meat.ogg": "",
- "mechanic.ogg": "",
- "medal.ogg": "",
- "meet.ogg": "meet",
- "melon.ogg": "",
- "merry-go-round.ogg": "",
+ "mattress.ogg": "mattress",
+ "mauve.ogg": "mauve",
+ "meal.ogg": "meal",
+ "meat.ogg": "meat",
+ "mechanic.ogg": "mechanic",
+ "medal.ogg": "medal",
+ "meet.ogg": "to meet",
+ "melon.ogg": "melon",
+ "merry-go-round.ogg": "merry-go-round",
"mice.ogg": "mice",
- "microphone.ogg": "",
- "milk.ogg": "",
- "mill.ogg": "",
- "mimosa.ogg": "",
- "mirror.ogg": "",
- "mixer.ogg": "",
+ "microphone.ogg": "microphone",
+ "milk.ogg": "milk",
+ "mill.ogg": "mill",
+ "mimosa.ogg": "mimosa",
+ "mirror.ogg": "mirror",
+ "mixer.ogg": "mixer",
"mole.ogg": "mole",
- "mom.ogg": "",
- "moon.ogg": "",
- "moose.ogg": "",
+ "mom.ogg": "mom",
+ "moon.ogg": "moon",
+ "moose.ogg": "moose",
"mop.ogg": "mop",
- "mosque.ogg": "",
+ "mosque.ogg": "mosque",
"mosquito.ogg": "mosquito",
- "mother.ogg": "",
- "motorcycle.ogg": "",
- "mountain.ogg": "",
- "mouse.ogg": "",
+ "mother.ogg": "mother",
+ "motorcycle.ogg": "motorcycle",
+ "mountain.ogg": "mountain",
+ "mouse.ogg": "mouse",
"mouth.ogg": "mouth",
- "movie.ogg": "",
- "mower.ogg": "",
+ "movie.ogg": "movie",
+ "mower.ogg": "mower",
"mud.ogg": "mud",
"mug.ogg": "mug",
"mule.ogg": "mule",
- "muscle.ogg": "",
+ "muscle.ogg": "muscle",
"mushroom.ogg": "mushroom",
- "music.ogg": "",
- "musician.ogg": "",
- "naked.ogg": "",
- "nap.ogg": "nap",
- "navel.ogg": "",
+ "music.ogg": "music",
+ "musician.ogg": "musician",
+ "naked.ogg": "naked",
+ "nap.ogg": "to nap",
+ "navel.ogg": "navel",
"neck.ogg": "neck",
- "necklace.ogg": "",
- "needle.ogg": "",
+ "necklace.ogg": "necklace",
+ "needle.ogg": "needle",
"nest.ogg": "nest",
"net.ogg": "net",
- "newspaper.ogg": "",
+ "newspaper.ogg": "newspaper",
"night.ogg": "night",
- "nightgown.ogg": "",
+ "nightgown.ogg": "nightgown",
"nose.ogg": "nose",
- "nostril.ogg": "",
- "notebook.ogg": "",
- "number.ogg": "",
- "nun.ogg": "",
- "nurse.ogg": "",
- "nurse_male.ogg": "",
+ "nostril.ogg": "nostril",
+ "notebook.ogg": "notebook",
+ "number.ogg": "number",
+ "nun.ogg": "nun",
+ "nurse.ogg": "nurse",
+ "nurse_male.ogg": "male nurse",
"nut.ogg": "nut",
"oar.ogg": "oar",
"ocean.ogg": "ocean",
- "office.ogg": "",
- "olive.ogg": "",
+ "office.ogg": "office",
+ "olive.ogg": "olive",
"on.ogg": "on",
- "onion.ogg": "",
- "open.ogg": "",
- "opossum.ogg": "",
- "orange-color.ogg": "orange",
+ "onion.ogg": "onion",
+ "open.ogg": "open",
+ "opossum.ogg": "opossum",
+ "orange-color.ogg": "orange colour",
"orange.ogg": "orange",
- "orchid.ogg": "",
- "ostrich.ogg": "",
- "otter.ogg": "",
+ "orchid.ogg": "orchid",
+ "ostrich.ogg": "ostrich",
+ "otter.ogg": "otter",
"owl.ogg": "owl",
"ox.ogg": "ox",
- "oyster.ogg": "",
- "pacifier.ogg": "",
+ "oyster.ogg": "oyster",
+ "pacifier.ogg": "pacifier",
"page.ogg": "page",
"pair.ogg": "pair",
- "pajamas.ogg": "",
+ "pajamas.ogg": "pajamas",
"pal.ogg": "pal",
- "palm_tree.ogg": "",
+ "palm_tree.ogg": "palm tree",
"pan.ogg": "pan",
- "panda.ogg": "",
- "panther.ogg": "",
- "panties.ogg": "",
- "pants.ogg": "",
- "papaya.ogg": "",
- "paper.ogg": "",
- "parachute.ogg": "",
- "parakeet.ogg": "",
- "parrot.ogg": "",
+ "panda.ogg": "panda",
+ "panther.ogg": "panther",
+ "panties.ogg": "panties",
+ "pants.ogg": "pants",
+ "papaya.ogg": "papaya",
+ "paper.ogg": "paper",
+ "parachute.ogg": "parachute",
+ "parakeet.ogg": "parakeet",
+ "parrot.ogg": "parrot",
"patch.ogg": "patch",
"path.ogg": "path",
"paw.ogg": "paw",
- "pea.ogg": "",
+ "pea.ogg": "pea",
"peach.ogg": "peach",
- "peacock.ogg": "",
- "peak.ogg": "",
- "pear.ogg": "",
- "pearl.ogg": "",
- "peck.ogg": "peck",
- "pedal.ogg": "",
- "pelican.ogg": "",
+ "peacock.ogg": "peacock",
+ "peak.ogg": "peak",
+ "pear.ogg": "pear",
+ "pearl.ogg": "pearl",
+ "peck.ogg": "to peck",
+ "pedal.ogg": "pedal",
+ "pelican.ogg": "pelican",
"pen.ogg": "pen",
"pencil.ogg": "pencil",
- "peony.ogg": "",
- "people.ogg": "",
- "pepper.ogg": "",
- "peppers.ogg": "",
+ "peony.ogg": "peony",
+ "people.ogg": "people",
+ "pepper.ogg": "pepper",
+ "peppers.ogg": "peppers",
"pet.ogg": "pet",
- "petal.ogg": "",
- "phone.ogg": "",
- "piano.ogg": "",
+ "petal.ogg": "petal",
+ "phone.ogg": "phone",
+ "piano.ogg": "piano",
"picture.ogg": "picture",
- "pie.ogg": "",
+ "pie.ogg": "pie",
"pig.ogg": "pig",
- "pigeon.ogg": "",
- "pill.ogg": "",
- "pillow.ogg": "",
- "pilot.ogg": "",
+ "pigeon.ogg": "pigeon",
+ "pill.ogg": "pill",
+ "pillow.ogg": "pillow",
+ "pilot.ogg": "pilot",
"pine.ogg": "pine",
- "pine_cone.ogg": "",
+ "pine_cone.ogg": "pine cone",
"pink.ogg": "pink",
- "pip.ogg": "",
- "pipe.ogg": "",
- "piranha.ogg": "",
- "pirate.ogg": "",
- "pizza.ogg": "",
+ "pip.ogg": "pip",
+ "pipe.ogg": "pipe",
+ "piranha.ogg": "piranha",
+ "pirate.ogg": "pirate",
+ "pizza.ogg": "pizza",
"plane.ogg": "plane",
- "planet.ogg": "",
+ "planet.ogg": "planet",
"plant.ogg": "plant",
"plate.ogg": "plate",
- "play.ogg": "play",
- "pliers.ogg": "",
- "plow.ogg": "plow",
+ "play.ogg": "to play",
+ "pliers.ogg": "pliers",
+ "plow.ogg": "to plow",
"plum.ogg": "plum",
- "plumber.ogg": "",
- "pocket.ogg": "",
- "pod.ogg": "",
+ "plumber.ogg": "plumber",
+ "pocket.ogg": "pocket",
+ "pod.ogg": "pod",
"pole.ogg": "pole",
- "police.ogg": "",
- "pompon.ogg": "",
- "pond.ogg": "",
- "pony.ogg": "",
+ "police.ogg": "police",
+ "pompon.ogg": "pompon",
+ "pond.ogg": "pond",
+ "pony.ogg": "pony",
"pool.ogg": "pool",
- "popcorn.ogg": "pop",
+ "popcorn.ogg": "popcorn",
"pope.ogg": "pope",
- "porthole.ogg": "",
- "post.ogg": "",
+ "porthole.ogg": "porthole",
+ "post.ogg": "post",
"pot.ogg": "pot",
- "potato.ogg": "",
- "pounce.ogg": "pounce",
- "president.ogg": "",
+ "potato.ogg": "potato",
+ "pounce.ogg": "to pounce",
+ "president.ogg": "president",
"pretty.ogg": "pretty",
"price.ogg": "price",
- "priest.ogg": "",
+ "priest.ogg": "priest",
"prince.ogg": "prince",
"princess.ogg": "princess",
- "prison.ogg": "",
- "prisoner.ogg": "",
+ "prison.ogg": "prison",
+ "prisoner.ogg": "prisoner",
"prize.ogg": "prize",
"pug.ogg": "pug",
- "pull.ogg": "",
- "pullover.ogg": "",
- "pumpkin.ogg": "",
+ "pull.ogg": "to pull",
+ "pullover.ogg": "pullover",
+ "pumpkin.ogg": "pumpkin",
"puppy.ogg": "puppy",
- "pyramid.ogg": "",
- "quarrel.ogg": "quarrel",
+ "pyramid.ogg": "pyramid",
+ "quarrel.ogg": "to quarrel",
"queen.ogg": "queen",
"question.ogg": "question",
"quilt.ogg": "quilt",
"quiz.ogg": "quiz",
- "rabbit.ogg": "",
- "rabbit_baby.ogg": "",
- "race.ogg": "",
- "radio.ogg": "",
- "radish.ogg": "",
- "raft.ogg": "",
+ "rabbit.ogg": "rabbit",
+ "rabbit_baby.ogg": "baby rabbit",
+ "race.ogg": "race",
+ "radio.ogg": "radio",
+ "radish.ogg": "radish",
+ "raft.ogg": "raft",
"rag.ogg": "rag",
"rage.ogg": "rage",
- "rain.ogg": "",
- "raincoat.ogg": "",
+ "rain.ogg": "rain",
+ "raincoat.ogg": "raincoat",
"rake.ogg": "rake",
"ramp.ogg": "ramp",
"ran.ogg": "ran",
- "raspberry.ogg": "",
+ "raspberry.ogg": "raspberry",
"rat.ogg": "rat",
- "razor.ogg": "",
- "read.ogg": "read",
+ "razor.ogg": "razor",
+ "read.ogg": "to read",
"red.ogg": "red",
- "reptile.ogg": "",
- "rhinoceros.ogg": "",
+ "reptile.ogg": "reptile",
+ "rhinoceros.ogg": "rhinoceros",
"rice.ogg": "rice",
"ride.ogg": "ride",
- "rifle.ogg": "",
+ "rifle.ogg": "rifle",
"right.ogg": "right",
- "rip.ogg": "rip",
- "rise.ogg": "",
- "river.ogg": "",
- "road.ogg": "",
- "roast.ogg": "",
- "robe.ogg": "",
- "robot.ogg": "",
+ "rip.ogg": "to rip",
+ "rise.ogg": "to rise",
+ "river.ogg": "river",
+ "road.ogg": "road",
+ "roast.ogg": "roast",
+ "robe.ogg": "robe",
+ "robot.ogg": "robot",
"rock.ogg": "rock",
- "rocket.ogg": "",
- "rolling_pin.ogg": "",
+ "rocket.ogg": "rocket",
+ "rolling_pin.ogg": "rolling pin",
"roof.ogg": "roof",
- "room.ogg": "",
- "root.ogg": "",
+ "room.ogg": "room",
+ "root.ogg": "root",
"rope.ogg": "rope",
"rose.ogg": "rose",
"round.ogg": "round",
- "rowing.ogg": "",
+ "rowing.ogg": "rowing",
"royal.ogg": "royal",
"rug.ogg": "rug",
- "run.ogg": "run",
+ "run.ogg": "to run",
"sad.ogg": "sad",
- "saddle.ogg": "",
+ "saddle.ogg": "saddle",
"sail.ogg": "sail",
- "sailor.ogg": "",
- "salamander.ogg": "",
- "salmon.ogg": "",
+ "sailor.ogg": "sailor",
+ "salamander.ogg": "salamander",
+ "salmon.ogg": "salmon",
"sand.ogg": "sand",
- "sandals.ogg": "",
+ "sandals.ogg": "sandals",
"sandwich.ogg": "sandwich",
- "sash.ogg": "",
+ "sash.ogg": "sash",
"sauce.ogg": "sauce",
- "sausage.ogg": "",
+ "sausage.ogg": "sausage",
"scale.ogg": "scale",
"scar.ogg": "scar",
- "scare.ogg": "",
+ "scare.ogg": "to scare",
"scarf.ogg": "scarf",
"school.ogg": "school",
- "school_bag.ogg": "",
+ "school_bag.ogg": "school bag",
"science.ogg": "science",
- "scissors.ogg": "",
- "scorpion.ogg": "",
- "scratch.ogg": "scratch",
- "scream.ogg": "scream",
+ "scissors.ogg": "scissors",
+ "scorpion.ogg": "scorpion",
+ "scratch.ogg": "to scratch",
+ "scream.ogg": "to scream",
"screw.ogg": "screw",
- "screwdriver.ogg": "",
- "scribble.ogg": "scribble",
- "sea.ogg": "",
+ "screwdriver.ogg": "screwdriver",
+ "scribble.ogg": "to scribble",
+ "sea.ogg": "sea",
"seat.ogg": "seat",
- "see.ogg": "see",
+ "see.ogg": "to see",
"seed.ogg": "seed",
- "shadow.ogg": "",
- "shake.ogg": "shake",
+ "shadow.ogg": "shadow",
+ "shake.ogg": "to shake",
"shark.ogg": "shark",
- "shave.ogg": "",
+ "shave.ogg": "to shave",
"shed.ogg": "shed",
- "sheep.ogg": "",
+ "sheep.ogg": "sheep",
"shelf.ogg": "shelf",
"shell.ogg": "shell",
"ship.ogg": "ship",
"shirt.ogg": "shirt",
"shoe.ogg": "shoe",
- "shoelace.ogg": "",
+ "shoelace.ogg": "shoelace",
"shop.ogg": "shop",
"shore.ogg": "shore",
"short.ogg": "short",
- "shovel.ogg": "",
+ "shovel.ogg": "shovel",
"shower.ogg": "shower",
"shrimp.ogg": "shrimp",
"shrub.ogg": "shrub",
"shut.ogg": "shut",
- "shutter.ogg": "",
+ "shutter.ogg": "shutter",
"sick.ogg": "sick",
- "sidewalk.ogg": "",
+ "sidewalk.ogg": "sidewalk",
"sign.ogg": "sign",
- "sing.ogg": "sing",
+ "sing.ogg": "to sing",
"sink.ogg": "sink",
- "sip.ogg": "sip",
- "sister.ogg": "",
- "sit.ogg": "sit",
+ "sip.ogg": "to sip",
+ "sister.ogg": "sister",
+ "sit.ogg": "to sit",
"skate.ogg": "skate",
- "skeleton.ogg": "",
+ "skeleton.ogg": "skeleton",
"ski.ogg": "ski",
- "skimmer.ogg": "",
+ "skimmer.ogg": "skimmer",
"skin.ogg": "skin",
"skirt.ogg": "skirt",
"skunk.ogg": "skunk",
"sky.ogg": "sky",
- "slam.ogg": "",
+ "slam.ogg": "to slam",
"sled.ogg": "sled",
- "sleep.ogg": "sleep",
+ "sleep.ogg": "to sleep",
"sleeve.ogg": "sleeve",
"sleigh.ogg": "sleigh",
"slide.ogg": "slide",
- "slim.ogg": "",
+ "slim.ogg": "slim",
"slime.ogg": "slime",
- "slippers.ogg": "",
+ "slippers.ogg": "slippers",
"slope.ogg": "slope",
- "sloppy.ogg": "",
- "slot.ogg": "",
- "sloth.ogg": "",
- "slug.ogg": "",
+ "sloppy.ogg": "sloppy",
+ "slot.ogg": "slot",
+ "sloth.ogg": "sloth",
+ "slug.ogg": "slug",
"small.ogg": "small",
- "smell.ogg": "smell",
+ "smell.ogg": "to smell",
"smile.ogg": "smile",
"smock.ogg": "smock",
"smoke.ogg": "smoke",
- "smooch.ogg": "smooch",
+ "smooch.ogg": "to smooch",
"snack.ogg": "snack",
"snail.ogg": "snail",
"snake.ogg": "snake",
"sneaker.ogg": "sneaker",
- "sniff.ogg": "sniff",
+ "sniff.ogg": "to sniff",
"snow.ogg": "snow",
- "soap.ogg": "",
- "sob.ogg": "",
+ "soap.ogg": "soap",
+ "sob.ogg": "sob",
"sock.ogg": "sock",
- "soldier.ogg": "",
- "sole.ogg": "",
- "sole_shoe.ogg": "",
- "son.ogg": "",
- "soup.ogg": "",
- "spade.ogg": "",
+ "soldier.ogg": "soldier",
+ "sole.ogg": "sole",
+ "sole_shoe.ogg": "sole shoe",
+ "son.ogg": "son",
+ "soup.ogg": "soup",
+ "spade.ogg": "spade",
"spaghetti.ogg": "spaghetti",
- "spark.ogg": "",
- "sparrow.ogg": "",
- "spatula.ogg": "",
- "speak.ogg": "",
+ "spark.ogg": "spark",
+ "sparrow.ogg": "sparrow",
+ "spatula.ogg": "spatula",
+ "speak.ogg": "to speak",
"spear.ogg": "spear",
- "spice.ogg": "",
+ "spice.ogg": "spice",
"spider.ogg": "spider",
- "spider_web.ogg": "",
+ "spider_web.ogg": "spider web",
"spike.ogg": "spike",
- "spill.ogg": "spill",
- "spinach.ogg": "",
- "spine.ogg": "",
- "spinning_top.ogg": "",
- "splash.ogg": "splash",
+ "spill.ogg": "to spill",
+ "spinach.ogg": "spinach",
+ "spine.ogg": "spine",
+ "spinning_top.ogg": "spinning top",
+ "splash.ogg": "to splash",
"splatter.ogg": "splatter",
"sponge.ogg": "sponge",
- "spool.ogg": "",
+ "spool.ogg": "spool",
"spoon.ogg": "spoon",
"sport.ogg": "sport",
"spot.ogg": "spot",
- "spray.ogg": "spray",
- "spread.ogg": "spread",
- "spring.ogg": "spring",
- "spring_season.ogg": "",
+ "spray.ogg": "to spray",
+ "spread.ogg": "to spread",
+ "spring.ogg": "to spring",
+ "spring_season.ogg": "spring season",
"sprinkle.ogg": "sprinkle",
"square.ogg": "square",
"squash.ogg": "squash",
- "squat.ogg": "squat",
+ "squat.ogg": "to squat",
"squid.ogg": "squid",
"squirrel.ogg": "squirrel",
"squirt.ogg": "squirt",
"stack.ogg": "stack",
"stage.ogg": "stage",
- "staircase.ogg": "",
+ "staircase.ogg": "staircase",
"stamp.ogg": "stamp",
"stand.ogg": "stand",
"star.ogg": "star",
- "stare.ogg": "stare",
+ "stare.ogg": "to stare",
"starfish.ogg": "starfish",
- "steam.ogg": "",
- "steep.ogg": "",
- "steeple.ogg": "",
+ "steam.ogg": "steam",
+ "steep.ogg": "steep",
+ "steeple.ogg": "steeple",
"stem.ogg": "stem",
- "step.ogg": "",
+ "step.ogg": "step",
"stew.ogg": "stew",
"stick.ogg": "stick",
- "sting.ogg": "sting",
- "stinky.ogg": "",
- "stitch.ogg": "",
- "stomach.ogg": "",
+ "sting.ogg": "to sting",
+ "stinky.ogg": "stinky",
+ "stitch.ogg": "to stitch",
+ "stomach.ogg": "stomach",
"stone.ogg": "stone",
- "stop.ogg": "stop",
+ "stop.ogg": "to stop",
"store.ogg": "store",
"stove.ogg": "stove",
"straight.ogg": "straight",
- "strainer.ogg": "",
+ "strainer.ogg": "strainer",
"straw.ogg": "straw",
"strawberry.ogg": "strawberry",
"stream.ogg": "stream",
"street.ogg": "street",
- "stretch.ogg": "stretch",
+ "stretch.ogg": "to stretch",
"string.ogg": "string",
"stripe.ogg": "stripe",
"strong.ogg": "strong",
- "student.ogg": "",
- "study.ogg": "study",
+ "student.ogg": "student",
+ "study.ogg": "to study",
"stump.ogg": "stump",
- "sugar.ogg": "",
+ "sugar.ogg": "sugar",
"suit.ogg": "suit",
- "suitcase.ogg": "",
+ "suitcase.ogg": "suitcase",
"summer.ogg": "summer",
- "summit.ogg": "",
+ "summit.ogg": "summit",
"sun.ogg": "sun",
"swan.ogg": "swan",
"sweat.ogg": "sweat",
- "sweatshirt.ogg": "",
+ "sweatshirt.ogg": "sweatshirt",
"swim.ogg": "swim",
- "table.ogg": "",
- "tablecloth.ogg": "",
- "tadpole.ogg": "",
+ "table.ogg": "table",
+ "tablecloth.ogg": "tablecloth",
+ "tadpole.ogg": "tadpole",
"tag.ogg": "tag",
- "tail.ogg": "",
+ "tail.ogg": "tail",
"tall.ogg": "tall",
- "tape_measure.ogg": "",
- "taxi.ogg": "",
- "teach.ogg": "teach",
+ "tape_measure.ogg": "tape measure",
+ "taxi.ogg": "taxi",
+ "teach.ogg": "to teach",
"teacher.ogg": "teacher",
- "tear.ogg": "tear",
- "teddy.ogg": "",
+ "tear.ogg": "to tear",
+ "teddy.ogg": "teddy",
"teeth.ogg": "teeth",
- "television.ogg": "",
- "temple.ogg": "",
- "tennis.ogg": "",
- "tent.ogg": "",
- "text.ogg": "",
+ "television.ogg": "television",
+ "temple.ogg": "temple",
+ "tennis.ogg": "tennis",
+ "tent.ogg": "tent",
+ "text.ogg": "text",
"thick.ogg": "thick",
- "thief.ogg": "",
+ "thief.ogg": "thief",
"thigh.ogg": "thigh",
- "think.ogg": "think",
+ "think.ogg": "to think",
"thread.ogg": "thread",
"throat.ogg": "throat",
"throw.ogg": "throw",
- "thumb.ogg": "",
+ "thumb.ogg": "thumb",
"tick.ogg": "tick",
- "ticket.ogg": "",
- "tiger.ogg": "",
+ "ticket.ogg": "ticket",
+ "tiger.ogg": "tiger",
"time.ogg": "time",
- "tin.ogg": "",
- "tire.ogg": "",
+ "tin.ogg": "tin",
+ "tire.ogg": "tire",
"tired.ogg": "tired",
- "tissue.ogg": "",
- "toad.ogg": "",
- "toaster.ogg": "",
- "to_drink.ogg": "",
- "toe.ogg": "",
+ "tissue.ogg": "tissue",
+ "to_drink.ogg": "to drink",
+ "toad.ogg": "toad",
+ "toaster.ogg": "toaster",
+ "toe.ogg": "toe",
"toilet.ogg": "toilet",
- "tomatoe.ogg": "",
- "tongs.ogg": "",
- "tongue.ogg": "",
+ "tomatoe.ogg": "tomatoe",
+ "tongs.ogg": "tongs",
+ "tongue.ogg": "tongue",
"tool.ogg": "tool",
"top.ogg": "top",
"torch.ogg": "torch",
- "touch.ogg": "touch",
+ "touch.ogg": "to touch",
"towel.ogg": "towel",
"toy.ogg": "toy",
"trail.ogg": "trail",
"train.ogg": "train",
- "train_station.ogg": "",
+ "train_station.ogg": "train station",
"trap.ogg": "trap",
"trash.ogg": "trash",
"tray.ogg": "tray",
"treat.ogg": "treat",
"tree.ogg": "tree",
- "triangle.ogg": "",
- "tribe.ogg": "",
- "trip.ogg": "",
+ "triangle.ogg": "triangle",
+ "tribe.ogg": "tribe",
+ "trip.ogg": "trip",
"truck.ogg": "truck",
"tube.ogg": "tube",
- "tulip.ogg": "",
+ "tulip.ogg": "tulip",
"tune.ogg": "tune",
- "turkey.ogg": "",
- "turnip.ogg": "",
- "turtle.ogg": "",
- "tusk.ogg": "",
- "twin_boys.ogg": "",
- "twin_girls.ogg": "",
- "umbrella.ogg": "",
+ "turkey.ogg": "turkey",
+ "turnip.ogg": "turnip",
+ "turtle.ogg": "turtle",
+ "tusk.ogg": "tusk",
+ "twin_boys.ogg": "twin boys",
+ "twin_girls.ogg": "twin girls",
+ "umbrella.ogg": "umbrella",
"under.ogg": "under",
- "uniform.ogg": "",
+ "uniform.ogg": "uniform",
"van.ogg": "van",
- "vapor.ogg": "",
- "vase.ogg": "",
- "vegetable.ogg": "",
- "vein.ogg": "",
- "verdure.ogg": "",
- "vest.ogg": "",
+ "vapor.ogg": "vapour",
+ "vase.ogg": "vase",
+ "vegetable.ogg": "vegetable",
+ "vein.ogg": "vein",
+ "verdure.ogg": "verdure",
+ "vest.ogg": "vest",
"vet.ogg": "vet",
- "viper.ogg": "",
- "vowel.ogg": "",
- "vulture.ogg": "",
- "wag.ogg": "wag",
- "walk.ogg": "walk",
- "wall.ogg": "",
- "walnut.ogg": "",
- "wart.ogg": "",
- "wash.ogg": "wash",
- "wasp.ogg": "",
+ "viper.ogg": "viper",
+ "vowel.ogg": "vowel",
+ "vulture.ogg": "vulture",
+ "wag.ogg": "to wag",
+ "walk.ogg": "to walk",
+ "wall.ogg": "wall",
+ "walnut.ogg": "walnut",
+ "wart.ogg": "wart",
+ "wash.ogg": "to wash",
+ "wasp.ogg": "wasp",
"watch.ogg": "watch",
"water.ogg": "water",
- "wave.ogg": "",
- "wedding.ogg": "",
+ "wave.ogg": "wave",
+ "wedding.ogg": "wedding",
"wedge.ogg": "wedge",
- "weight.ogg": "",
+ "weight.ogg": "weight",
"wet.ogg": "wet",
- "whale.ogg": "",
+ "whale.ogg": "whale",
"wheat.ogg": "wheat",
"wheel.ogg": "wheel",
"whisk.ogg": "whisk",
- "whisper.ogg": "whisper",
+ "whisper.ogg": "to whisper",
"white.ogg": "white",
- "wide.ogg": "",
- "wife.ogg": "",
+ "wide.ogg": "wide",
+ "wife.ogg": "wife",
"wig.ogg": "wig",
- "win.ogg": "win",
+ "win.ogg": "to win",
"wind.ogg": "wind",
- "window.ogg": "",
- "window_glass.ogg": "",
+ "window.ogg": "window",
+ "window_glass.ogg": "window glass",
"wing.ogg": "wing",
- "winter.ogg": "",
- "wolf.ogg": "",
- "woman.ogg": "",
+ "winter.ogg": "winter",
+ "wolf.ogg": "wolf",
+ "woman.ogg": "woman",
"wood.ogg": "wood",
- "word.ogg": "",
- "worker.ogg": "",
- "world.ogg": "",
- "wreath.ogg": "",
+ "word.ogg": "word",
+ "worker.ogg": "worker",
+ "world.ogg": "world",
+ "wreath.ogg": "wreath",
"wrench.ogg": "wrench",
"wrist.ogg": "wrist",
- "write.ogg": "write",
- "yarn.ogg": "yarn",
- "yellow.ogg": "",
- "yogurt.ogg": "",
+ "write.ogg": "to write",
+ "yellow.ogg": "yellow",
+ "yogurt.ogg": "yogurt",
"yum.ogg": "yum",
- "zebra.ogg": "",
- "zipper.ogg": "",
+ "zebra.ogg": "zebra",
+ "zipper.ogg": "zipper",
"zoo.ogg": "zoo"
}
diff --git a/src/activities/lang/resource/content-eu.json b/src/activities/lang/resource/content-eu.json
new file mode 100644
index 000000000..1ef7cd987
--- /dev/null
+++ b/src/activities/lang/resource/content-eu.json
@@ -0,0 +1,1092 @@
+{
+ "10.ogg": "hamar",
+ "11.ogg": "hamaika",
+ "12.ogg": "hamabi",
+ "16.ogg": "hamasei",
+ "U0030.ogg": "zero",
+ "U0031.ogg": "bat",
+ "U0032.ogg": "bi",
+ "U0033.ogg": "hiru",
+ "U0034.ogg": "lau",
+ "U0035.ogg": "bost",
+ "U0036.ogg": "sei",
+ "U0037.ogg": "zazpi",
+ "U0038.ogg": "zortzi",
+ "U0039.ogg": "bederatzi",
+ "accountant.ogg": "kontularia",
+ "ache.ogg": "mina",
+ "acorn.ogg": "ezkurra",
+ "actor.ogg": "aktorea",
+ "air_horn.ogg": "sirena",
+ "alarmclock.ogg": "iratzargailua",
+ "alligator.ogg": "kaimana",
+ "alphabet.ogg": "alfabetoa",
+ "anchor.ogg": "aingura",
+ "angel.ogg": "aingerua",
+ "angry.ogg": "haserrea",
+ "animal.ogg": "animalia",
+ "ankle.ogg": "orkatila",
+ "ant.ogg": "inurria, txindurria",
+ "anteater.ogg": "hartz inurrijalea",
+ "antelope.ogg": "antilopea",
+ "apple.ogg": "sagarra",
+ "apple_tree.ogg": "sagarrondoa",
+ "appliance.ogg": "etxetresna",
+ "apricot.ogg": "abrikota",
+ "arm.ogg": "beso",
+ "armchair.ogg": "besaulkia",
+ "artichoke.ogg": "orburua",
+ "artist.ogg": "artista",
+ "asparagus.ogg": "zainzuria, frantses-porrua",
+ "astronaut.ogg": "astronauta",
+ "athlete.ogg": "atleta",
+ "avocado.ogg": "ahuakatea",
+ "ax.ogg": "aizkora",
+ "baby_bottle.ogg": "biberoia",
+ "back.ogg": "bizkar",
+ "badge.ogg": "entseina",
+ "bag.ogg": "poltsa",
+ "bait.ogg": "beita",
+ "balance.ogg": "balantza",
+ "bald.ogg": "burusoila",
+ "ball.ogg": "baloia",
+ "ball_of_yarn.ogg": "artilezko piru bola",
+ "ball_soccer.ogg": "futboleko baloia",
+ "ballet.ogg": "balleta",
+ "bank.ogg": "bankua",
+ "banker_female.ogg": "emakume bankaria",
+ "bark.ogg": "zaunk egin",
+ "barn.ogg": "bihitegia",
+ "bat.ogg": "saguzarra",
+ "bath.ogg": "bainuontzia",
+ "bathing_suit.ogg": "bainu jantzia",
+ "bay.ogg": "badia",
+ "beach.ogg": "hondartza",
+ "bean.ogg": "babarrun, indaba",
+ "bear.ogg": "hartza",
+ "beard.ogg": "bizar",
+ "beat.ogg": "irabazi",
+ "beaver.ogg": "kastorea",
+ "bed.ogg": "ohea",
+ "bedroom.ogg": "logela",
+ "bee.ogg": "erlea",
+ "beetle.ogg": "kakalardoa",
+ "beg.ogg": "erregutu",
+ "behind.ogg": "atzean",
+ "bell.ogg": "kanpaia",
+ "belly.ogg": "sabel",
+ "bench.ogg": "bankua",
+ "bib.ogg": "dortsala",
+ "big.ogg": "handi",
+ "big_top.ogg": "karpa",
+ "bike.ogg": "bizikleta",
+ "bird.ogg": "txoria",
+ "bit.ogg": "puska",
+ "bite.ogg": "koxk egin",
+ "black.ogg": "beltz",
+ "blackberry.ogg": "masusta",
+ "blackbird.ogg": "zozoa",
+ "blade.ogg": "xafla",
+ "blind.ogg": "itsu",
+ "blink.ogg": "kliskatu",
+ "block.ogg": "blokea",
+ "blond.ogg": "ilehori",
+ "blue.ogg": "urdin",
+ "blueberry.ogg": "ahabia",
+ "blush.ogg": "gorritzea",
+ "board.ogg": "taula",
+ "boat.ogg": "txalupa",
+ "boil.ogg": "egosi",
+ "bolt.ogg": "torlojua",
+ "bomb.ogg": "bonba",
+ "bone.ogg": "hezurra",
+ "book.ogg": "liburua",
+ "bookcase.ogg": "apalategia",
+ "bottom.ogg": "ipurdia",
+ "box.ogg": "kutxa",
+ "boxer.ogg": "boxeolaria",
+ "boy.ogg": "mutila",
+ "braid.ogg": "txirikorda",
+ "brain.ogg": "garun",
+ "branch.ogg": "adarra",
+ "bread.ogg": "ogia",
+ "break.ogg": "puskatu",
+ "breast.ogg": "bular",
+ "brick.ogg": "adreilua",
+ "bricklayer.ogg": "igeltseroa",
+ "bride.ogg": "andregaia",
+ "bridge.ogg": "zubia",
+ "bright.ogg": "argi",
+ "broccoli.ogg": "brokolia",
+ "brother.ogg": "neba/anaia",
+ "brown.ogg": "marroi",
+ "brush.ogg": "brotxa",
+ "bubble.ogg": "burbuila",
+ "bucket.ogg": "pertza",
+ "bud.ogg": "kimua",
+ "buffalo.ogg": "bufaloa",
+ "bug.ogg": "zomorroa",
+ "bulb.ogg": "bonbilla",
+ "bull.ogg": "zezena",
+ "bump.ogg": "koskorra",
+ "bun.ogg": "opila",
+ "bus.ogg": "autobusa",
+ "bush.ogg": "zuhaixka",
+ "butcher.ogg": "harakina",
+ "butter.ogg": "butter",
+ "butterfly.ogg": "tximeleta, pinpilinpauxa",
+ "button.ogg": "botoia",
+ "cabbage.ogg": "aza",
+ "cabin.ogg": "etxola",
+ "cacao.ogg": "kakaoa",
+ "cactus.ogg": "kaktusa",
+ "cage.ogg": "kaiola",
+ "cake.ogg": "pastela",
+ "call.ogg": "hots egin",
+ "camel.ogg": "gamelua",
+ "camera.ogg": "kamera",
+ "camp.ogg": "kanpamendu",
+ "can.ogg": "poto, lata",
+ "canary.ogg": "kanarioa",
+ "candle.ogg": "kandela",
+ "candy.ogg": "goxokia",
+ "cane.ogg": "bastoia",
+ "canoe.ogg": "kanoa",
+ "canon.ogg": "kanoia",
+ "canyon.ogg": "arroila",
+ "cap.ogg": "txanoa",
+ "cape.ogg": "kapa",
+ "car.ogg": "berebila",
+ "carafe.ogg": "pitxerra, txarroa",
+ "card.ogg": "txartela",
+ "carnival.ogg": "inauteri",
+ "carpenter.ogg": "arotza",
+ "carpet.ogg": "alfonbra",
+ "carrot.ogg": "azenarioa",
+ "cart.ogg": "orga",
+ "cash.ogg": "eskudirua",
+ "castle.ogg": "gaztelua",
+ "cat.ogg": "katua",
+ "cat_female.ogg": "katemea",
+ "catch.ogg": "hartu",
+ "caterpillar.ogg": "beldarra",
+ "cauldron.ogg": "pertza",
+ "cauliflower.ogg": "azalorea",
+ "cave.ogg": "haitzuloa",
+ "cavern.ogg": "leizea",
+ "celery.ogg": "apioa, perrexil hezea",
+ "centipede.ogg": "ehunzangoa",
+ "cereal.ogg": "zereala",
+ "chain.ogg": "katea",
+ "chair.ogg": "aulkia",
+ "chalk.ogg": "klariona",
+ "chameleon.ogg": "kameleoia",
+ "chandelier.ogg": "argi-armiarma",
+ "chat.ogg": "berriketan egin",
+ "cheek.ogg": "masail",
+ "cheer.ogg": "alaitasuna",
+ "cheese.ogg": "gazta",
+ "chef.ogg": "sukaldaria",
+ "cherry.ogg": "gerezia",
+ "chest.ogg": "kutxa",
+ "chick.ogg": "txita",
+ "chicken.ogg": "oiloa",
+ "child.ogg": "umea",
+ "chimney.ogg": "tximinia",
+ "chimp.ogg": "txinpantzea",
+ "chin.ogg": "kokotsa",
+ "chocolate.ogg": "txokolatea",
+ "chop.ogg": "txikitu",
+ "chores.ogg": "zereginak",
+ "christmas.ogg": "gabonak",
+ "cigar.ogg": "purua",
+ "circus.ogg": "zirkua",
+ "city.ogg": "hiria",
+ "clam.ogg": "txirla",
+ "clap.ogg": "txalo egin",
+ "class.ogg": "ikasgela",
+ "claw.ogg": "atzaparra",
+ "clay.ogg": "buztina",
+ "clean.ogg": "garbitu",
+ "cleaning_lady.ogg": "garbitzailea",
+ "cliff.ogg": "labarra",
+ "climb.ogg": "eskalatzea",
+ "clock.ogg": "ordularia",
+ "cloth.ogg": "oihala",
+ "clothes_hanger.ogg": "esekilekua",
+ "cloud.ogg": "hodeia",
+ "cloudy.ogg": "hodeitsu",
+ "clover.ogg": "hirusta",
+ "clown.ogg": "pailazoa",
+ "coach.ogg": "entrenatzailea",
+ "coast.ogg": "kosta",
+ "coat.ogg": "berokia",
+ "cobra.ogg": "kobra",
+ "coconut.ogg": "kokoa",
+ "cod.ogg": "makailao, bakailao",
+ "coffee.ogg": "kafea",
+ "coin.ogg": "txanpona",
+ "cold.ogg": "hotza",
+ "color.ogg": "kolore",
+ "colt.ogg": "moxala",
+ "comb.ogg": "orrazia",
+ "cone.ogg": "konoa",
+ "cook.ogg": "janaria prestatu",
+ "cookie.ogg": "gaileta",
+ "cork.ogg": "kortxoa",
+ "corn.ogg": "artoa",
+ "couch.ogg": "sofa",
+ "cough.ogg": "eztul egin",
+ "couple.ogg": "bikotea",
+ "cow.ogg": "behia",
+ "cowboy.ogg": "unaia",
+ "crab.ogg": "karramarroa",
+ "cradle.ogg": "sehaska",
+ "craft.ogg": "eskulana",
+ "crawl.ogg": "narras ibili",
+ "crazy.ogg": "zoro",
+ "creek.ogg": "erreka",
+ "crepe.ogg": "krepea",
+ "crib.ogg": "sehaska",
+ "croak.ogg": "kro-kro egin",
+ "crocodile.ogg": "krokodiloa",
+ "cross.ogg": "gurutzea",
+ "crow.ogg": "belea",
+ "crown.ogg": "koroa",
+ "crumb.ogg": "ogi apurrak",
+ "crust.ogg": "ogi azala",
+ "cry.ogg": "negar egin",
+ "crystal.ogg": "kristala",
+ "cube.ogg": "kuboa",
+ "cucumber.ogg": "luzokerra, pepinoa",
+ "curtain.ogg": "gortina",
+ "cut.ogg": "moztu",
+ "cute.ogg": "polit",
+ "dad.ogg": "aita",
+ "daffodil.ogg": "lilipa, nartzisoa",
+ "daisy.ogg": "bitxilorea",
+ "dam.ogg": "presa",
+ "dance.ogg": "dantza egitea",
+ "dandelion.ogg": "txikoria",
+ "dart_board.ogg": "dardo taula",
+ "date_fruit.ogg": "datila",
+ "deer.ogg": "oreina",
+ "den.ogg": "gordelekua",
+ "desert.ogg": "basamortua",
+ "desk.ogg": "idazmahaia",
+ "dessert.ogg": "postrea",
+ "diamond.ogg": "diamantea",
+ "dig.ogg": "zulatu",
+ "dirt.ogg": "zikinkeria",
+ "dirty.ogg": "zikin",
+ "dish.ogg": "platera",
+ "dishcloth.ogg": "sukaldeko zapia",
+ "dive.ogg": "urperatzea",
+ "doctor.ogg": "sendagilea",
+ "doe.ogg": "adarzabala",
+ "dog.ogg": "zakurra",
+ "doll.ogg": "panpina",
+ "dolphin.ogg": "izurdea",
+ "domino.ogg": "dominoa",
+ "door.ogg": "atea",
+ "doormat.ogg": "lanpasa",
+ "dot.ogg": "puntua",
+ "doughnut.ogg": "donuta",
+ "dove.ogg": "usoa",
+ "dragon.ogg": "herensugea",
+ "dragonfly.ogg": "burruntzia, sorgin-orratza",
+ "draw.ogg": "marraztu",
+ "drawer.ogg": "tiradera",
+ "dream.ogg": "amestu",
+ "dress.ogg": "soinekoa",
+ "drink.ogg": "edaria",
+ "drip.ogg": "tanta",
+ "drive.ogg": "gidatu",
+ "drool.ogg": "lerdea jario",
+ "drum.ogg": "danborra",
+ "dry.ogg": "lehortu",
+ "duck.ogg": "ahatea",
+ "duck_mother.ogg": "ahate ama",
+ "dune.ogg": "duna",
+ "dwarf.ogg": "nanoa",
+ "eagle.ogg": "arranoa",
+ "ear.ogg": "belarri",
+ "earth.ogg": "lurra",
+ "eat.ogg": "jan",
+ "egg.ogg": "arrautza",
+ "eggplant.ogg": "alberjinia",
+ "elbow.ogg": "ukondo",
+ "electrician.ogg": "elektrikaria",
+ "elk.ogg": "altzea",
+ "empty.ogg": "huts",
+ "engine.ogg": "motorra",
+ "engineer.ogg": "ingeniaria",
+ "eraser.ogg": "ezabagoma",
+ "explore.ogg": "arakatu",
+ "eyelash.ogg": "betilea",
+ "eyes.ogg": "begiak",
+ "face.ogg": "aurpegi",
+ "fair.ogg": "feria",
+ "fairy.ogg": "maitagarria",
+ "fall.ogg": "erori",
+ "fall_season.ogg": "udazkena",
+ "family.ogg": "familia",
+ "fan.ogg": "haizagailua",
+ "farm.ogg": "baserria",
+ "farmer.ogg": "baserritarra",
+ "fat.ogg": "gizen",
+ "faucet.ogg": "txorrota",
+ "fawn.ogg": "oreinkumea",
+ "fear.ogg": "beldurra",
+ "feast.ogg": "otoruntza",
+ "feather.ogg": "luma",
+ "feed.ogg": "jaten eman",
+ "femur.ogg": "femur",
+ "fetch.ogg": "ekarri",
+ "fig.ogg": "pikua",
+ "fin.ogg": "hegatsa",
+ "find.ogg": "aurkitu",
+ "finger.ogg": "hatz",
+ "fire.ogg": "sua",
+ "fire_extinguisher.ogg": "su-itzalgailua",
+ "fireman.ogg": "suhitzailea",
+ "fish.ogg": "arraina",
+ "fisherman.ogg": "arrantzalea",
+ "fist.ogg": "ukabil",
+ "flacon.ogg": "dosifikatzailea",
+ "flag.ogg": "bandera",
+ "flame.ogg": "garra",
+ "flamingo.ogg": "flamenkoa",
+ "flash.ogg": "esku-argia, linterna",
+ "flat.ogg": "Laua",
+ "flies.ogg": "euliak",
+ "float.ogg": "flotatu",
+ "flour.ogg": "irina",
+ "flower.ogg": "lorea",
+ "fluff.ogg": "ilauna",
+ "flute.ogg": "txirula",
+ "fly.ogg": "hegan egin",
+ "foam.ogg": "aparra",
+ "foot.ogg": "oin",
+ "forest.ogg": "basoa",
+ "fork.ogg": "sardexka",
+ "fountain.ogg": "iturria",
+ "fox.ogg": "azeria",
+ "freeze.ogg": "izoztu",
+ "friend.ogg": "laguna",
+ "fries.ogg": "patata frijituak",
+ "frog.ogg": "igela",
+ "front.ogg": "aurrean",
+ "fruit.ogg": "fruta",
+ "fudge.ogg": "azukre gozokia",
+ "full.ogg": "bete",
+ "fur.ogg": "ilajea",
+ "game.ogg": "jokoa",
+ "garage.ogg": "garajea",
+ "garden.ogg": "lorategia",
+ "garlic.ogg": "baratxuria, berakatza",
+ "gem.ogg": "harribitxia",
+ "giant.ogg": "erraldoia",
+ "gift.ogg": "oparia",
+ "giraffe.ogg": "lepoluzea",
+ "girl.ogg": "neska",
+ "glass.ogg": "edalontzia",
+ "glasses.ogg": "betaurrekoak",
+ "glove.ogg": "eskularrua",
+ "glue.ogg": "lekeda",
+ "gnome.ogg": "gnomoa",
+ "goat.ogg": "ahuntza",
+ "golden.ogg": "urrezko",
+ "golf.ogg": "golfa",
+ "goose.ogg": "antzara",
+ "gorilla.ogg": "gorila",
+ "grain.ogg": "alea, garaua",
+ "grandmother.ogg": "amona",
+ "grape.ogg": "mahatsa",
+ "grapefruit.ogg": "arabisagarra, pomeloa",
+ "grass.ogg": "belarra",
+ "grave.ogg": "hilobia",
+ "gray.ogg": "Gris",
+ "green.ogg": "berde",
+ "grill.ogg": "erretegia",
+ "grin.ogg": "irribarrea",
+ "ground.ogg": "zorua",
+ "growl.ogg": "marmartu",
+ "guignol.ogg": "txotxongiloa",
+ "guinea_pig.ogg": "akuria",
+ "gum.ogg": "txiklea",
+ "hair.ogg": "ile",
+ "hair_dryer.ogg": "ile-lehorgailua",
+ "half.ogg": "erdia",
+ "ham.ogg": "urdaiazpikoa",
+ "hamburger.ogg": "hanburgesa",
+ "hammer.ogg": "mailua",
+ "hand.ogg": "esku",
+ "handlebar.ogg": "eskulekua",
+ "happy.ogg": "alai",
+ "harp.ogg": "harpa",
+ "hat.ogg": "kapela",
+ "hatch.ogg": "oskola urratu",
+ "hay.ogg": "belar donua, saralea",
+ "head.ogg": "buru",
+ "hear.ogg": "entzun",
+ "heat.ogg": "beroa",
+ "hedge.ogg": "hesia",
+ "hedgehog.ogg": "trikua",
+ "heel.ogg": "orpoa",
+ "helmet.ogg": "kaskoa",
+ "hen.ogg": "oiloa",
+ "herd.ogg": "artaldea",
+ "high.ogg": "altu",
+ "hike.ogg": "ibilaldia",
+ "hill.ogg": "muino",
+ "hip.ogg": "aldaka",
+ "hippopotamus.ogg": "hipopotamoa",
+ "hit.ogg": "astindu",
+ "hive.ogg": "erlauntza",
+ "hockey.ogg": "hockeya",
+ "hole.ogg": "zuloa",
+ "home.ogg": "etxea",
+ "hook.ogg": "kakoa",
+ "hop.ogg": "txingoka ibili",
+ "horse.ogg": "zaldia",
+ "hose.ogg": "mangera",
+ "hospital.ogg": "ospitalea",
+ "hot.ogg": "bero",
+ "hot_dog.ogg": "saltxitxa-ogitarteko, hot dog",
+ "hound.ogg": "ehiza-txakurra",
+ "house.ogg": "etxea",
+ "howl.ogg": "uhuri egin",
+ "hug.ogg": "besarkatu",
+ "huge.ogg": "itzel",
+ "hummingbird.ogg": "kolibria",
+ "hunchbacked.ogg": "konkorduna",
+ "hunter.ogg": "ehiztaria",
+ "husband.ogg": "senarra",
+ "hut.ogg": "etxola",
+ "hyena.ogg": "hiena",
+ "ice.ogg": "izotza",
+ "iceberg.ogg": "izotz-mendia",
+ "iguana.ogg": "iguana",
+ "ill.ogg": "gaixo",
+ "ink.ogg": "tinta",
+ "island.ogg": "uhartea, irla",
+ "jacket.ogg": "jaka",
+ "jaguar.ogg": "jaguarra",
+ "jam.ogg": "marmelada",
+ "jay.ogg": "eskinosoa",
+ "jelly.ogg": "gelatina",
+ "jellyfish.ogg": "marmoka",
+ "jewel.ogg": "bitxia",
+ "job.ogg": "enplegua",
+ "jockey.ogg": "jockeya",
+ "jog.ogg": "korrika egin",
+ "joy.ogg": "alaitasuna",
+ "judge.ogg": "epailea",
+ "judo.ogg": "judoa",
+ "juggler.ogg": "malabarista",
+ "juice.ogg": "zukua",
+ "jump.ogg": "salto egin",
+ "kangaroo.ogg": "kangurua",
+ "keel.ogg": "gila",
+ "kernel.ogg": "muina",
+ "keyboard.ogg": "teklatua",
+ "kimono.ogg": "kimonoa",
+ "king.ogg": "erregea",
+ "kiss.ogg": "muxu eman",
+ "kitchen.ogg": "sukaldea",
+ "kite.ogg": "kometa",
+ "kitten.ogg": "katakumea",
+ "kiwi.ogg": "kiwia",
+ "knee.ogg": "belaun",
+ "kneel.ogg": "belaunikatu",
+ "knife.ogg": "labana",
+ "knight.ogg": "zalduna",
+ "knit.ogg": "puntua egin",
+ "knot.ogg": "korapiloa",
+ "koala.ogg": "koala",
+ "lad.ogg": "mutila",
+ "lady.ogg": "andrea",
+ "ladybug.ogg": "marigorringoa",
+ "lake.ogg": "aintzira, lakua",
+ "lama.ogg": "llama",
+ "lamb.ogg": "arkumea",
+ "lamp.ogg": "lanpara",
+ "land.ogg": "lursaila",
+ "lane.ogg": "erreia",
+ "lap.ogg": "magal",
+ "lasso.ogg": "lakioa",
+ "laugh.ogg": "barre egin",
+ "lava.ogg": "laba",
+ "lawn.ogg": "belardia",
+ "lawyer.ogg": "abokatua",
+ "leaf.ogg": "hostoa",
+ "ledge.ogg": "irtengunea, koska",
+ "leek.ogg": "porrua",
+ "left.ogg": "ezker",
+ "leg.ogg": "hanka",
+ "lemon.ogg": "limoia",
+ "lemonade.ogg": "limoi-edari, limonada",
+ "lemur.ogg": "lemurra",
+ "leopard.ogg": "lehoinabarra",
+ "lettuce.ogg": "letxuga",
+ "librarian.ogg": "liburuzaina",
+ "lick.ogg": "miazkatu",
+ "lid.ogg": "tapa",
+ "lift.ogg": "altxatu",
+ "light.ogg": "argia",
+ "lighthouse.ogg": "itsasargia",
+ "lightning.ogg": "tximista",
+ "lilac.ogg": "lila",
+ "lime.ogg": "lima",
+ "line.ogg": "lerroa",
+ "link.ogg": "katebegia",
+ "lion.ogg": "lehoia",
+ "lion_cub.ogg": "lehoikumea",
+ "lip.ogg": "ezpain",
+ "liquid.ogg": "likido",
+ "lizard.ogg": "muskerra",
+ "lobster.ogg": "otarraina",
+ "log.ogg": "enborra",
+ "look.ogg": "begiratu",
+ "lunch.ogg": "bazkaria",
+ "mad.ogg": "eroa",
+ "magic.ogg": "magiko",
+ "magnet.ogg": "imana",
+ "magnifying_glass.ogg": "lupa",
+ "magpie.ogg": "mika",
+ "mail.ogg": "posta",
+ "man.ogg": "gizona",
+ "mane.ogg": "adatsa",
+ "mango.ogg": "mangoa",
+ "map.ogg": "mapa",
+ "maple.ogg": "astigarra",
+ "marble.ogg": "puxtarria",
+ "mashed_potatoes.ogg": "patata purea",
+ "mask.ogg": "maskara",
+ "mast.ogg": "masta",
+ "mat.ogg": "tapiza, alfonbra",
+ "match.ogg": "pospoloa",
+ "mate.ogg": "kidea",
+ "mattress.ogg": "koltxoia",
+ "mauve.ogg": "malba-kolorea",
+ "meal.ogg": "otordua",
+ "meat.ogg": "haragia",
+ "mechanic.ogg": "mekanikaria",
+ "medal.ogg": "domina",
+ "meet.ogg": "topatu",
+ "melon.ogg": "meloia",
+ "merry-go-round.ogg": "zaldiko-maldikoa",
+ "mice.ogg": "saguak",
+ "microphone.ogg": "mikrofonoa",
+ "milk.ogg": "esnea",
+ "mill.ogg": "errota",
+ "mimosa.ogg": "mimosa",
+ "mirror.ogg": "ispilua",
+ "mixer.ogg": "nahasgailua",
+ "mole.ogg": "satorra",
+ "mom.ogg": "amatxo",
+ "moon.ogg": "ilargia",
+ "moose.ogg": "altzea",
+ "mop.ogg": "lanbasa",
+ "mosque.ogg": "meskita",
+ "mosquito.ogg": "eltxoa",
+ "mother.ogg": "ama",
+ "motorcycle.ogg": "motozikleta",
+ "mountain.ogg": "mendia",
+ "mouse.ogg": "sagua",
+ "mouth.ogg": "aho",
+ "movie.ogg": "filma",
+ "mower.ogg": "sega-makina",
+ "mud.ogg": "lokatza",
+ "mug.ogg": "katilua",
+ "mule.ogg": "mandoa",
+ "muscle.ogg": "gihar",
+ "mushroom.ogg": "perretxikoa",
+ "music.ogg": "musika",
+ "musician.ogg": "musikaria",
+ "naked.ogg": "biluzi",
+ "nap.ogg": "siesta egin",
+ "navel.ogg": "zilbor",
+ "neck.ogg": "lepo",
+ "necklace.ogg": "lepokoa",
+ "needle.ogg": "orratza",
+ "nest.ogg": "kabia",
+ "net.ogg": "sarea",
+ "newspaper.ogg": "egunkaria",
+ "night.ogg": "gaua",
+ "nightgown.ogg": "kamisoia",
+ "nose.ogg": "sudur",
+ "nostril.ogg": "sudur-zulo",
+ "notebook.ogg": "koadernoa",
+ "number.ogg": "zenbakia",
+ "nun.ogg": "moja, lekaimea",
+ "nurse.ogg": "erizaina",
+ "nurse_male.ogg": "erizaina",
+ "nut.ogg": "kakahuetea",
+ "oar.ogg": "arrauna",
+ "ocean.ogg": "ozeanoa",
+ "office.ogg": "bulego",
+ "olive.ogg": "oliba",
+ "on.ogg": "gainean",
+ "onion.ogg": "tipula",
+ "open.ogg": "ireki",
+ "opossum.ogg": "zarigueia",
+ "orange-color.ogg": "laranja kolore",
+ "orange.ogg": "laranja",
+ "orchid.ogg": "orkidea",
+ "ostrich.ogg": "ostruka",
+ "otter.ogg": "igaraba",
+ "owl.ogg": "hontza",
+ "ox.ogg": "idia",
+ "oyster.ogg": "ostra",
+ "pacifier.ogg": "zupakia",
+ "page.ogg": "orria",
+ "pair.ogg": "bikotea",
+ "pajamas.ogg": "pijama",
+ "pal.ogg": "adiskidea",
+ "palm_tree.ogg": "palmondoa",
+ "pan.ogg": "paella-ontzi",
+ "panda.ogg": "panda",
+ "panther.ogg": "pantera",
+ "panties.ogg": "kuleroa",
+ "pants.ogg": "prakak",
+ "papaya.ogg": "papaia",
+ "paper.ogg": "papera",
+ "parachute.ogg": "jausgailua",
+ "parakeet.ogg": "perikitoa",
+ "parrot.ogg": "loroa",
+ "patch.ogg": "adabakia",
+ "path.ogg": "bidea",
+ "paw.ogg": "erpea",
+ "pea.ogg": "ilarra",
+ "peach.ogg": "mertxika",
+ "peacock.ogg": "pauma",
+ "peak.ogg": "gailurra",
+ "pear.ogg": "madaria, udarea",
+ "pearl.ogg": "perla",
+ "peck.ogg": "mokokatu",
+ "pedal.ogg": "pedala",
+ "pelican.ogg": "pelikanoa",
+ "pen.ogg": "bolaluma",
+ "pencil.ogg": "arkatza",
+ "peony.ogg": "peonia",
+ "people.ogg": "jendea",
+ "pepper.ogg": "piperra",
+ "peppers.ogg": "piperrak",
+ "pet.ogg": "maskota",
+ "petal.ogg": "petaloa",
+ "phone.ogg": "telefonoa",
+ "piano.ogg": "pianoa",
+ "picture.ogg": "irudia",
+ "pie.ogg": "tarta",
+ "pig.ogg": "txerria",
+ "pigeon.ogg": "usoa",
+ "pill.ogg": "pilula",
+ "pillow.ogg": "burukoa",
+ "pilot.ogg": "pilotua",
+ "pine.ogg": "pinua",
+ "pine_cone.ogg": "pinaburua",
+ "pink.ogg": "arrosa",
+ "pip.ogg": "hazi, pipita",
+ "pipe.ogg": "hodia",
+ "piranha.ogg": "piraña",
+ "pirate.ogg": "pirata",
+ "pizza.ogg": "pizza",
+ "plane.ogg": "hegazkina",
+ "planet.ogg": "planeta",
+ "plant.ogg": "landarea",
+ "plate.ogg": "platera",
+ "play.ogg": "jolastu",
+ "pliers.ogg": "aliketak",
+ "plow.ogg": "goldatu",
+ "plum.ogg": "arana, okarana",
+ "plumber.ogg": "iturgina",
+ "pocket.ogg": "poltsikoa",
+ "pod.ogg": "leka",
+ "pole.ogg": "zutoina",
+ "police.ogg": "polizia",
+ "pompon.ogg": "borla",
+ "pond.ogg": "putzua",
+ "pony.ogg": "poneya",
+ "pool.ogg": "igerilekua",
+ "popcorn.ogg": "krispeta",
+ "pope.ogg": "aita santua",
+ "porthole.ogg": "idi-begia",
+ "post.ogg": "postontzia",
+ "pot.ogg": "eltzea",
+ "potato.ogg": "patata",
+ "pounce.ogg": "jauzi egin",
+ "president.ogg": "presidentea",
+ "pretty.ogg": "eder",
+ "price.ogg": "prezioa",
+ "priest.ogg": "apaiza",
+ "prince.ogg": "printzea",
+ "princess.ogg": "printzesa",
+ "prison.ogg": "espetxea",
+ "prisoner.ogg": "atxiloa",
+ "prize.ogg": "saria",
+ "pug.ogg": "puga",
+ "pull.ogg": "tira egin",
+ "pullover.ogg": "jertsea",
+ "pumpkin.ogg": "kalabaza",
+ "puppy.ogg": "txakurkumea",
+ "pyramid.ogg": "piramidea",
+ "quarrel.ogg": "errieta egin",
+ "queen.ogg": "erregina",
+ "question.ogg": "galdera",
+ "quilt.ogg": "edredoia",
+ "quiz.ogg": "galdeketa",
+ "rabbit.ogg": "untxia",
+ "rabbit_baby.ogg": "untxikumea",
+ "race.ogg": "lasterketa",
+ "radio.ogg": "Irratia",
+ "radish.ogg": "errefaua",
+ "raft.ogg": "baltsa",
+ "rag.ogg": "trapua",
+ "rage.ogg": "amorrua",
+ "rain.ogg": "euria",
+ "raincoat.ogg": "zira",
+ "rake.ogg": "eskuarea",
+ "ramp.ogg": "arrapala",
+ "ran.ogg": "korrika egin",
+ "raspberry.ogg": "mugurdia",
+ "rat.ogg": "arratoia",
+ "razor.ogg": "bizar-aitzurra",
+ "read.ogg": "irakurri",
+ "red.ogg": "gorri",
+ "reptile.ogg": "narrastia",
+ "rhinoceros.ogg": "errinozeroa",
+ "rice.ogg": "arroza",
+ "ride.ogg": "bizikletan ibili",
+ "rifle.ogg": "fusila",
+ "right.ogg": "eskuin",
+ "rip.ogg": "erauzi",
+ "rise.ogg": "igo",
+ "river.ogg": "ibaia",
+ "road.ogg": "errepidea",
+ "roast.ogg": "errekia",
+ "robe.ogg": "bata",
+ "robot.ogg": "robota",
+ "rock.ogg": "harkaitza",
+ "rocket.ogg": "suziria",
+ "rolling_pin.ogg": "arrabola",
+ "roof.ogg": "teilatua",
+ "room.ogg": "gela",
+ "root.ogg": "erroa, sustraia",
+ "rope.ogg": "soka",
+ "rose.ogg": "arrosa",
+ "round.ogg": "biribildua",
+ "rowing.ogg": "arrauna",
+ "royal.ogg": "erregerena",
+ "rug.ogg": "alfonbra",
+ "run.ogg": "korrika egin",
+ "sad.ogg": "goibel, triste",
+ "saddle.ogg": "zela",
+ "sail.ogg": "belaontzia",
+ "sailor.ogg": "marinela",
+ "salamander.ogg": "arrabioa",
+ "salmon.ogg": "izokina",
+ "sand.ogg": "harea, hondarra",
+ "sandals.ogg": "sandaliak",
+ "sandwich.ogg": "ogitartekoa",
+ "sash.ogg": "gerrikoa",
+ "sauce.ogg": "saltsa",
+ "sausage.ogg": "saltxitxa",
+ "scale.ogg": "balantza",
+ "scar.ogg": "orbain",
+ "scare.ogg": "beldurtu",
+ "scarf.ogg": "bufanda",
+ "school.ogg": "ikastetxea",
+ "school_bag.ogg": "eskolako motxila",
+ "science.ogg": "zientzia",
+ "scissors.ogg": "artaziak",
+ "scorpion.ogg": "eskorpioia",
+ "scratch.ogg": "harramazkatu",
+ "scream.ogg": "oihukatu",
+ "screw.ogg": "torlojua",
+ "screwdriver.ogg": "bihurkina",
+ "scribble.ogg": "zirriborratu",
+ "sea.ogg": "itsasoa",
+ "seat.ogg": "eserlekua",
+ "see.ogg": "ikusi",
+ "seed.ogg": "hazia",
+ "shadow.ogg": "itzala",
+ "shake.ogg": "astindu",
+ "shark.ogg": "marrazoa",
+ "shave.ogg": "bizarra moztu",
+ "shed.ogg": "estalgunea, estalpea",
+ "sheep.ogg": "ardia",
+ "shelf.ogg": "apala",
+ "shell.ogg": "maskorra",
+ "ship.ogg": "ontzia",
+ "shirt.ogg": "kamiseta",
+ "shoe.ogg": "zapata",
+ "shoelace.ogg": "lokarria",
+ "shop.ogg": "denda",
+ "shore.ogg": "urbazterra",
+ "short.ogg": "galtzamotza",
+ "shovel.ogg": "pala",
+ "shower.ogg": "dutxa",
+ "shrimp.ogg": "izkira",
+ "shrub.ogg": "zuhaixka",
+ "shut.ogg": "itxi",
+ "shutter.ogg": "leiho-ohola",
+ "sick.ogg": "gaixo",
+ "sidewalk.ogg": "espaloia",
+ "sign.ogg": "seinalea",
+ "sing.ogg": "abestu",
+ "sink.ogg": "konketa",
+ "sip.ogg": "hurrupatu",
+ "sister.ogg": "ahizpa/arreba",
+ "sit.ogg": "eseri",
+ "skate.ogg": "irristagailua",
+ "skeleton.ogg": "hezurdura",
+ "ski.ogg": "eskia",
+ "skimmer.ogg": "bitsadera",
+ "skin.ogg": "azal",
+ "skirt.ogg": "gona",
+ "skunk.ogg": "mofeta",
+ "sky.ogg": "zerua",
+ "slam.ogg": "kolpez itxi",
+ "sled.ogg": "lera",
+ "sleep.ogg": "lo egin",
+ "sleeve.ogg": "mahuka",
+ "sleigh.ogg": "elur lera",
+ "slide.ogg": "txirrista",
+ "slim.ogg": "mehe",
+ "slime.ogg": "lerdea",
+ "slippers.ogg": "zapatilak",
+ "slope.ogg": "aldapa",
+ "sloppy.ogg": "axolagabe",
+ "slot.ogg": "zirrikitua",
+ "sloth.ogg": "nagia",
+ "slug.ogg": "barea",
+ "small.ogg": "txiki",
+ "smell.ogg": "usaia aditu",
+ "smile.ogg": "irribarrea",
+ "smock.ogg": "mantala",
+ "smoke.ogg": "kea",
+ "smooch.ogg": "musukatu",
+ "snack.ogg": "mokadua",
+ "snail.ogg": "barraskiloa",
+ "snake.ogg": "sugea",
+ "sneaker.ogg": "kirol zapatila",
+ "sniff.ogg": "usnatu",
+ "snow.ogg": "elurra",
+ "soap.ogg": "xaboia",
+ "sob.ogg": "negar-zotinka",
+ "sock.ogg": "galtzerdia",
+ "soldier.ogg": "soldadua",
+ "sole.ogg": "mihi-arraina",
+ "sole_shoe.ogg": "oinetakoaren zola",
+ "son.ogg": "semea",
+ "soup.ogg": "zopa",
+ "spade.ogg": "laia",
+ "spaghetti.ogg": "espageti",
+ "spark.ogg": "txinparta",
+ "sparrow.ogg": "txolarrea",
+ "spatula.ogg": "espatula",
+ "speak.ogg": "hitz egin",
+ "spear.ogg": "arpoia",
+ "spice.ogg": "espezia",
+ "spider.ogg": "armiarma",
+ "spider_web.ogg": "amarauna",
+ "spike.ogg": "iltzea",
+ "spill.ogg": "isuri",
+ "spinach.ogg": "ziazerba, espinaka",
+ "spine.ogg": "bizkarrezur",
+ "spinning_top.ogg": "ziba",
+ "splash.ogg": "plast egin",
+ "splatter.ogg": "zipriztina",
+ "sponge.ogg": "esponja",
+ "spool.ogg": "txirrika",
+ "spoon.ogg": "goilara",
+ "sport.ogg": "kirola",
+ "spot.ogg": "orbana",
+ "spray.ogg": "lainoztatu",
+ "spread.ogg": "igurtzi",
+ "spring.ogg": "jauzi egin",
+ "spring_season.ogg": "udaberria",
+ "sprinkle.ogg": "zipriztindu",
+ "square.ogg": "karratua",
+ "squash.ogg": "kuia",
+ "squat.ogg": "makurtu",
+ "squid.ogg": "txibia, txipiroia",
+ "squirrel.ogg": "urtxintxa, katagorria",
+ "squirt.ogg": "zurrusta",
+ "stack.ogg": "pila",
+ "stage.ogg": "agertokia, eszena",
+ "staircase.ogg": "eskailera",
+ "stamp.ogg": "zigilua",
+ "stand.ogg": "zutik egon",
+ "star.ogg": "izarra",
+ "stare.ogg": "behatu",
+ "starfish.ogg": "itsas izarra",
+ "steam.ogg": "lurruna",
+ "steep.ogg": "pikoa",
+ "steeple.ogg": "kanpandorrea",
+ "stem.ogg": "zurtoina",
+ "step.ogg": "maila",
+ "stew.ogg": "erregosia",
+ "stick.ogg": "makila",
+ "sting.ogg": "ziztatu",
+ "stinky.ogg": "kirasduna",
+ "stitch.ogg": "josi",
+ "stomach.ogg": "sabel",
+ "stone.ogg": "harria",
+ "stop.ogg": "gelditu",
+ "store.ogg": "saltokia",
+ "stove.ogg": "sukaldea",
+ "straight.ogg": "zuzena",
+ "strainer.ogg": "iragazkia",
+ "straw.ogg": "lastoa",
+ "strawberry.ogg": "marrubia",
+ "stream.ogg": "zurruzta",
+ "street.ogg": "kalea",
+ "stretch.ogg": "luzatu",
+ "string.ogg": "soka",
+ "stripe.ogg": "marra",
+ "strong.ogg": "sendo",
+ "student.ogg": "ikaslea",
+ "study.ogg": "ikasi",
+ "stump.ogg": "motzondoa",
+ "sugar.ogg": "azukrea",
+ "suit.ogg": "jantzia",
+ "suitcase.ogg": "maleta",
+ "summer.ogg": "uda",
+ "summit.ogg": "gailurra",
+ "sun.ogg": "eguzkia",
+ "swan.ogg": "beltxarga, zisnea",
+ "sweat.ogg": "izerdi",
+ "sweatshirt.ogg": "kirol-kamiseta",
+ "swim.ogg": "igeri egin",
+ "table.ogg": "mahaia",
+ "tablecloth.ogg": "mahai-zapia",
+ "tadpole.ogg": "zapaburua, txalburua",
+ "tag.ogg": "etiketa",
+ "tail.ogg": "buztana",
+ "tall.ogg": "altu",
+ "tape_measure.ogg": "neurketa-zinta",
+ "taxi.ogg": "taxia",
+ "teach.ogg": "irakatsi",
+ "teacher.ogg": "irakaslea",
+ "tear.ogg": "urratu",
+ "teddy.ogg": "hartzatxo panpina",
+ "teeth.ogg": "hortzak",
+ "television.ogg": "telebista",
+ "temple.ogg": "tenplua",
+ "tennis.ogg": "tenisa",
+ "tent.ogg": "kanpin-denda",
+ "text.ogg": "testua",
+ "thick.ogg": "gizen",
+ "thief.ogg": "lapurra",
+ "thigh.ogg": "izter",
+ "think.ogg": "pentsatu",
+ "thread.ogg": "haria",
+ "throat.ogg": "eztarri",
+ "throw.ogg": "jaurtiketa",
+ "thumb.ogg": "erpuru",
+ "tick.ogg": "akaina",
+ "ticket.ogg": "txartela",
+ "tiger.ogg": "tigrea",
+ "time.ogg": "denbora",
+ "tin.ogg": "potea",
+ "tire.ogg": "pneumatikoa",
+ "tired.ogg": "nekatu",
+ "tissue.ogg": "paperezko mukizapia",
+ "to_drink.ogg": "edan",
+ "toad.ogg": "apoa",
+ "toaster.ogg": "xigorgailua",
+ "toe.ogg": "behatz",
+ "toilet.ogg": "komuna",
+ "tomatoe.ogg": "tomatea",
+ "tongs.ogg": "matxardak",
+ "tongue.ogg": "mingain",
+ "tool.ogg": "tresna",
+ "top.ogg": "tontorra",
+ "torch.ogg": "zuzia",
+ "touch.ogg": "ukitu",
+ "towel.ogg": "eskuoihala",
+ "toy.ogg": "jostailua",
+ "trail.ogg": "ibilbidea",
+ "train.ogg": "trena",
+ "train_station.ogg": "tren geltokia",
+ "trap.ogg": "tranpa",
+ "trash.ogg": "zakarrontzia",
+ "tray.ogg": "erretilua",
+ "treat.ogg": "gozokia",
+ "tree.ogg": "zuhaitza",
+ "triangle.ogg": "triangelua",
+ "tribe.ogg": "tribua",
+ "trip.ogg": "txangoa",
+ "truck.ogg": "Kamioia",
+ "tube.ogg": "ezpainetako margoa",
+ "tulip.ogg": "tulipa",
+ "tune.ogg": "doinua",
+ "turkey.ogg": "indiollarra",
+ "turnip.ogg": "arbia",
+ "turtle.ogg": "dordoka",
+ "tusk.ogg": "betortza",
+ "twin_boys.ogg": "mutil bikiak",
+ "twin_girls.ogg": "neska bikiak",
+ "umbrella.ogg": "aterkia",
+ "under.ogg": "azpian",
+ "uniform.ogg": "uniformea",
+ "van.ogg": "furgoneta",
+ "vapor.ogg": "lurruna",
+ "vase.ogg": "loreontzia",
+ "vegetable.ogg": "barazkia",
+ "vein.ogg": "zain",
+ "verdure.ogg": "barazkia",
+ "vest.ogg": "txalekoa",
+ "vet.ogg": "albaitaria",
+ "viper.ogg": "sugegorria",
+ "vowel.ogg": "bokala",
+ "vulture.ogg": "saia",
+ "wag.ogg": "astindu",
+ "walk.ogg": "ibili",
+ "wall.ogg": "horma",
+ "walnut.ogg": "intxaurra",
+ "wart.ogg": "garatxoa",
+ "wash.ogg": "garbitu",
+ "wasp.ogg": "liztorra",
+ "watch.ogg": "erlojua",
+ "water.ogg": "ura",
+ "wave.ogg": "olatua, uhina",
+ "wedding.ogg": "ezkontza",
+ "wedge.ogg": "ziria",
+ "weight.ogg": "pisua",
+ "wet.ogg": "busti",
+ "whale.ogg": "balea",
+ "wheat.ogg": "garia",
+ "wheel.ogg": "gurpila",
+ "whisk.ogg": "irabiagailua",
+ "whisper.ogg": "xuxurlatu",
+ "white.ogg": "zuri",
+ "wide.ogg": "zabal",
+ "wife.ogg": "emaztea",
+ "wig.ogg": "peluka",
+ "win.ogg": "irabazi",
+ "wind.ogg": "haizea",
+ "window.ogg": "leihoa",
+ "window_glass.ogg": "leihoko beira",
+ "wing.ogg": "hegala",
+ "winter.ogg": "negua",
+ "wolf.ogg": "otsoa",
+ "woman.ogg": "emakumea",
+ "wood.ogg": "zura",
+ "word.ogg": "hitza",
+ "worker.ogg": "langilea, behargina",
+ "world.ogg": "mundua",
+ "wreath.ogg": "girlanda",
+ "wrench.ogg": "giltza ingelesa",
+ "wrist.ogg": "eskumutur",
+ "write.ogg": "idatzi",
+ "yellow.ogg": "horia",
+ "yogurt.ogg": "jogurta",
+ "yum.ogg": "mmm",
+ "zebra.ogg": "zebra",
+ "zipper.ogg": "kremailera",
+ "zoo.ogg": "zooa"
+}
diff --git a/src/activities/lang/resource/content-fr.json b/src/activities/lang/resource/content-fr.json
index d1546da63..914b48e9b 100644
--- a/src/activities/lang/resource/content-fr.json
+++ b/src/activities/lang/resource/content-fr.json
@@ -1,1079 +1,1082 @@
{
"10.ogg": "dix",
"11.ogg": "onze",
"12.ogg": "douze",
"16.ogg": "seize",
"U0030.ogg": "zéro",
"U0031.ogg": "un",
"U0032.ogg": "deux",
"U0033.ogg": "trois",
"U0034.ogg": "quatre",
"U0035.ogg": "cinq",
"U0036.ogg": "six",
"U0037.ogg": "sept",
"U0038.ogg": "huit",
"U0039.ogg": "neuf",
"accountant.ogg": "un comptable",
"ache.ogg": "la douleur",
"acorn.ogg": "un gland",
"actor.ogg": "un acteur",
"air_horn.ogg": "un klaxon",
"alarmclock.ogg": "un réveil",
"alligator.ogg": "un alligator",
"alphabet.ogg": "un alphabet",
"anchor.ogg": "une ancre",
"angel.ogg": "un ange",
"angry.ogg": "la colère",
"animal.ogg": "les animaux",
"ankle.ogg": "la cheville",
"ant.ogg": "une fourmi",
"anteater.ogg": "un fourmilier",
"antelope.ogg": "une antilope",
"apple.ogg": "une pomme",
"apple_tree.ogg": "un pommier",
"appliance.ogg": "un appareil",
"apricot.ogg": "un abricot",
"arm.ogg": "un bras",
"armchair.ogg": "un fauteuil",
"artichoke.ogg": "un artichaut",
"artist.ogg": "un artiste",
"asparagus.ogg": "une asperge",
"astronaut.ogg": "un astronaute",
"athlete.ogg": "un athlète",
"avocado.ogg": "un avocat",
"ax.ogg": "une hache",
"baby_bottle.ogg": "un biberon",
"back.ogg": "le dos",
"badge.ogg": "une décoration",
"bag.ogg": "un sac",
"bait.ogg": "un appât",
"balance.ogg": "une balance",
"bald.ogg": "chauve",
"ball.ogg": "une balle",
"ball_of_yarn.ogg": "une pelote",
"ball_soccer.ogg": "un ballon de foot",
"ballet.ogg": "un ballet",
"bank.ogg": "une banque",
"banker_female.ogg": "banquière",
"bark.ogg": "aboyer",
"barn.ogg": "une grange",
"bat.ogg": "une chauve-souris",
"bath.ogg": "un bain",
"bathing_suit.ogg": "un maillot",
"bay.ogg": "une baie",
"beach.ogg": "une plage",
"bean.ogg": "un haricot",
"bear.ogg": "un ours",
"beard.ogg": "une barbe",
"beat.ogg": "se battre",
"beaver.ogg": "un castor",
"bed.ogg": "un lit",
"bedroom.ogg": "une chambre",
"bee.ogg": "une abeille",
"beetle.ogg": "un scarabée",
"beg.ogg": "supplier",
"behind.ogg": "derrière",
"bell.ogg": "une cloche",
"belly.ogg": "le ventre",
"bench.ogg": "un banc",
"bib.ogg": "un bavoir",
"big.ogg": "grand",
"big_top.ogg": "un chapiteau",
"bike.ogg": "un vélo",
"bird.ogg": "un oiseau",
"bit.ogg": "un morceau",
"bite.ogg": "croquer",
"black.ogg": "noir",
"blackberry.ogg": "une mûre",
"blackbird.ogg": "un merle",
"blade.ogg": "une lame",
"blind.ogg": "un aveugle",
"blink.ogg": "cligner",
"block.ogg": "un bloc",
"blond.ogg": "blond",
"blue.ogg": "bleu",
"blueberry.ogg": "une myrtille",
"blush.ogg": "rougir",
"board.ogg": "une planche",
"boat.ogg": "une barque",
"boil.ogg": "bouillir",
"bolt.ogg": "un boulon",
"bomb.ogg": "une bombe",
"bone.ogg": "un os",
"book.ogg": "un livre",
"bookcase.ogg": "une bibliothèque",
"bottom.ogg": "le derrière",
"box.ogg": "une boîte",
"boxer.ogg": "boxer",
"boy.ogg": "un garçon",
"braid.ogg": "une tresse",
"brain.ogg": "un cerveau",
"branch.ogg": "une branche",
"bread.ogg": "du pain",
"break.ogg": "casser",
"breast.ogg": "la poitrine",
"brick.ogg": "une brique",
"bricklayer.ogg": "un maçon",
"bride.ogg": "la mariée",
"bridge.ogg": "un pont",
"bright.ogg": "brillant",
"broccoli.ogg": "un brocoli",
"brother.ogg": "un frère",
"brown.ogg": "brun",
"brush.ogg": "un pinceau",
"bubble.ogg": "une bulle",
"bucket.ogg": "un seau",
"bud.ogg": "un bourgeon",
"buffalo.ogg": "un buffle",
"bug.ogg": "un insecte",
"bulb.ogg": "une ampoule",
"bull.ogg": "un taureau",
"bump.ogg": "une bosse",
"bun.ogg": "une brioche",
"bus.ogg": "un bus",
"bush.ogg": "un buisson",
"butcher.ogg": "un boucher",
"butter.ogg": "du beurre",
"butterfly.ogg": "un papillon",
"button.ogg": "un bouton",
"cabbage.ogg": "un chou",
"cabin.ogg": "une cabane",
"cacao.ogg": "du cacao",
"cactus.ogg": "un cactus",
"cage.ogg": "une cage",
"cake.ogg": "un gâteau",
"call.ogg": "appeler",
"camel.ogg": "un chameau",
"camera.ogg": "un appareil photo",
"camp.ogg": "un camping",
"can.ogg": "une conserve",
"canary.ogg": "un canari",
"candle.ogg": "une bougie",
"candy.ogg": "un bonbon",
"cane.ogg": "une cane",
"canoe.ogg": "un canoë",
"canon.ogg": "un canon",
"canyon.ogg": "un canyon",
"cap.ogg": "une casquette",
"cape.ogg": "une cape",
"car.ogg": "une voiture",
"carafe.ogg": "une carafe",
"card.ogg": "une carte",
"carnival.ogg": "le carnaval",
"carpenter.ogg": "un charpentier",
"carpet.ogg": "un tapis",
"carrot.ogg": "une carotte",
"cart.ogg": "un chariot de supermarché",
"cash.ogg": "de l'argent",
"castle.ogg": "un château",
"cat.ogg": "un chat",
"cat_female.ogg": "une chatte",
"catch.ogg": "attraper",
"caterpillar.ogg": "une chenille",
"cauldron.ogg": "un chaudron",
"cauliflower.ogg": "un chou-fleur",
"cave.ogg": "une grotte",
"cavern.ogg": "une caverne",
"celery.ogg": "un céleri",
"centipede.ogg": "un mille-pattes",
"cereal.ogg": "une céréale",
"chain.ogg": "une chaîne",
"chair.ogg": "une chaise",
"chalk.ogg": "une craie",
"chameleon.ogg": "un caméléon",
"chandelier.ogg": "un lustre",
"chat.ogg": "discuter",
"cheek.ogg": "la joue",
"cheer.ogg": "encourager",
"cheese.ogg": "du fromage",
"chef.ogg": "une cuisinière",
"cherry.ogg": "une cerise",
"chest.ogg": "un coffre",
"chick.ogg": "un poussin",
"chicken.ogg": "un poulet",
"child.ogg": "un enfant",
"chimney.ogg": "une cheminée",
"chimp.ogg": "un chimpanzé",
"chin.ogg": "le menton",
"chocolate.ogg": "du chocolat",
"chop.ogg": "découper",
"chores.ogg": "des tâches ménagères",
"christmas.ogg": "noël",
"cigar.ogg": "un cigare",
"circus.ogg": "un cirque",
"city.ogg": "une ville",
"clam.ogg": "une palourde",
"clap.ogg": "une tape",
"class.ogg": "une classe",
"claw.ogg": "une griffe",
"clay.ogg": "de l'argile",
"clean.ogg": "se laver",
"cleaning_lady.ogg": "une femme de ménage",
"cliff.ogg": "une falaise",
"climb.ogg": "escalader",
"clock.ogg": "un réveil",
"cloth.ogg": "du tissu",
"clothes_hanger.ogg": "un cintre",
"cloud.ogg": "un nuage",
"cloudy.ogg": "nuageux",
"clover.ogg": "un trèfle",
"clown.ogg": "un clown",
"coach.ogg": "une entraîneuse",
"coast.ogg": "une côte",
"coat.ogg": "un manteau",
"cobra.ogg": "un cobra",
"coconut.ogg": "une noix de coco",
"cod.ogg": "une morue",
"coffee.ogg": "un café",
"coin.ogg": "une pièce",
"cold.ogg": "le froid",
"color.ogg": "la couleur",
"colt.ogg": "un poulain",
"comb.ogg": "un peigne",
"cone.ogg": "un cône",
"cook.ogg": "cuisiner",
"cookie.ogg": "un biscuit",
"cork.ogg": "un bouchon",
"corn.ogg": "du maïs",
"couch.ogg": "un canapé",
"cough.ogg": "tousser",
"couple.ogg": "un couple",
"cow.ogg": "une vache",
"cowboy.ogg": "un cow-boy",
"crab.ogg": "un crabe",
"cradle.ogg": "un berceau",
"craft.ogg": "des travaux manuels",
"crawl.ogg": "ramper",
"crazy.ogg": "un fou",
"creek.ogg": "un ruisseau",
"crepe.ogg": "une crêpe",
"crib.ogg": "des berceaux",
"croak.ogg": "coasser",
"crocodile.ogg": "un crocodile",
"cross.ogg": "une croix",
"crow.ogg": "un corbeau",
"crown.ogg": "une couronne",
"crumb.ogg": "une miette",
"crust.ogg": "une croûte",
"cry.ogg": "pleurer",
"crystal.ogg": "un cristal",
"cube.ogg": "un cube",
"cucumber.ogg": "un concombre",
"curtain.ogg": "un rideau",
"cut.ogg": "couper",
"cute.ogg": "adorable",
"dad.ogg": "un papa",
"daffodil.ogg": "une jonquille",
"daisy.ogg": "une marguerite",
"dam.ogg": "un barrage",
"dance.ogg": "danser",
"dandelion.ogg": "un pissenlit",
"dart_board.ogg": "une cible",
"date_fruit.ogg": "une datte",
"deer.ogg": "un cerf",
"den.ogg": "une tanière",
"desert.ogg": "un désert",
"desk.ogg": "un bureau",
"dessert.ogg": "un dessert",
"diamond.ogg": "un diamant",
"dig.ogg": "creuser",
"dirt.ogg": "le sol",
"dirty.ogg": "sale",
"dish.ogg": "un plat",
"dishcloth.ogg": "un torchon",
"dive.ogg": "plonger",
"doctor.ogg": "une docteure",
"doe.ogg": "une biche",
"dog.ogg": "un chien",
"doll.ogg": "une poupée",
"dolphin.ogg": "un dauphin",
"domino.ogg": "un domino",
"door.ogg": "une porte",
"doormat.ogg": "un paillasson",
"dot.ogg": "un point",
"doughnut.ogg": "un beignet",
"dove.ogg": "une colombe",
"dragon.ogg": "un dragon",
"dragonfly.ogg": "une libellule",
"draw.ogg": "un dessin",
"drawer.ogg": "un tiroir",
"dream.ogg": "un rêve",
"dress.ogg": "une robe",
"drink.ogg": "une boisson",
"drip.ogg": "une goutte",
"drive.ogg": "conduire",
"drool.ogg": "baver",
"drum.ogg": "un tambour",
"dry.ogg": "sécher",
"duck.ogg": "un canard",
"duck_mother.ogg": "une canne",
"dune.ogg": "une dune",
"dwarf.ogg": "un nain",
"eagle.ogg": "un aigle",
"ear.ogg": "une oreille",
"earth.ogg": "la Terre",
"eat.ogg": "manger",
"egg.ogg": "un oeuf",
"eggplant.ogg": "une aubergine",
"elbow.ogg": "le coude",
"electrician.ogg": "un électricien",
"elk.ogg": "un wapiti",
"empty.ogg": "vide",
"engine.ogg": "un moteur",
"engineer.ogg": "un ingénieur",
"eraser.ogg": "une gomme",
"explore.ogg": "des explorateurs",
"eyelash.ogg": "un cil",
"eyes.ogg": "les yeux",
"face.ogg": "un visage",
"fair.ogg": "un manège",
"fairy.ogg": "une fée",
"fall.ogg": "tomber",
"fall_season.ogg": "l'automne",
"family.ogg": "une famille",
"fan.ogg": "un ventilateur",
"farm.ogg": "une ferme",
"farmer.ogg": "un fermier",
"fat.ogg": "gras",
"faucet.ogg": "un robinet",
"fawn.ogg": "un faon",
"fear.ogg": "avoir peur",
"feast.ogg": "un poulet",
"feather.ogg": "une plume",
"feed.ogg": "nourrir",
"femur.ogg": "un fémur",
"fetch.ogg": "rapporter",
"fig.ogg": "une figue",
"fin.ogg": "une nageoire",
"find.ogg": "trouver",
"finger.ogg": "un doigt",
"fire.ogg": "un feu",
"fire_extinguisher.ogg": "un extincteur",
"fireman.ogg": "un pompier",
"fish.ogg": "un poisson",
"fisherman.ogg": "un pêcheur",
"fist.ogg": "un poing",
"flacon.ogg": "un flacon",
"flag.ogg": "un drapeau",
"flame.ogg": "une flamme",
"flamingo.ogg": "un flamant rose",
"flash.ogg": "une lampe torche",
"flat.ogg": "un appartement",
"flies.ogg": "une mouche",
"float.ogg": "flotter",
"flour.ogg": "la farine",
"flower.ogg": "une fleur",
"fluff.ogg": "une peluche",
"flute.ogg": "une flûte",
"fly.ogg": "voler",
"foam.ogg": "la mousse",
"foot.ogg": "un pied",
"forest.ogg": "une forêt",
"fork.ogg": "une fourchette",
"fountain.ogg": "une fontaine",
"fox.ogg": "un renard",
"freeze.ogg": "geler",
"friend.ogg": "des amis",
"fries.ogg": "une frite",
"frog.ogg": "une grenouille",
"front.ogg": "devant",
"fruit.ogg": "un fruit",
"fudge.ogg": "un caramel",
"full.ogg": "plein",
"fur.ogg": "la fourrure",
"game.ogg": "un jeu",
"garage.ogg": "un garage",
"garden.ogg": "un jardin",
"garlic.ogg": "de l'ail",
"gem.ogg": "une gemme",
"giant.ogg": "un géant",
"gift.ogg": "un cadeau",
"giraffe.ogg": "une girafe",
"girl.ogg": "une fille",
"glass.ogg": "un verre",
"glasses.ogg": "des lunettes",
"glove.ogg": "un gant",
"glue.ogg": "la colle",
"gnome.ogg": "un gnome",
"goat.ogg": "une chèvre",
"golden.ogg": "doré",
"golf.ogg": "le golf",
"goose.ogg": "une oie",
"gorilla.ogg": "un gorille",
"grain.ogg": "un épi",
"grandmother.ogg": "une grand-mère",
"grape.ogg": "une grappe de raisin",
"grapefruit.ogg": "un pamplemousse",
"grass.ogg": "une herbe",
"grave.ogg": "une tombe",
"gray.ogg": "gris",
"green.ogg": "vert",
"grill.ogg": "un barbecue",
"grin.ogg": "un sourire",
"ground.ogg": "la terre",
"growl.ogg": "grogner",
"guignol.ogg": "guignol",
"guinea_pig.ogg": "un cochon d'inde",
"gum.ogg": "du chewing-gum",
"hair.ogg": "les cheveux",
"hair_dryer.ogg": "un sèche-cheveux",
"half.ogg": "la moitié",
"ham.ogg": "un jambon",
+ "hamburger.ogg": "un hamburger",
"hammer.ogg": "un marteau",
"hand.ogg": "une main",
"handlebar.ogg": "un guidon",
"happy.ogg": "heureux",
"harp.ogg": "une harpe",
"hat.ogg": "un chapeau",
"hatch.ogg": "éclore",
"hay.ogg": "le foin",
"head.ogg": "la tête",
"hear.ogg": "entendre",
"heat.ogg": "la chaleur",
"hedge.ogg": "une bordure",
"hedgehog.ogg": "un hérisson",
"heel.ogg": "le talon",
"helmet.ogg": "un casque",
"hen.ogg": "une poule",
"herd.ogg": "un troupeau",
"high.ogg": "haut",
"hike.ogg": "une promenade",
"hill.ogg": "une colline",
"hip.ogg": "une hanche",
"hippopotamus.ogg": "un hippopotame",
"hit.ogg": "une bagarre",
"hive.ogg": "une ruche",
"hockey.ogg": "le hockey",
"hole.ogg": "un trou",
"home.ogg": "une maison",
"hook.ogg": "un hameçon",
"hop.ogg": "rebondir",
"horse.ogg": "un cheval",
"hose.ogg": "un tuyau",
"hospital.ogg": "un hôpital",
"hot.ogg": "chaud",
"hot_dog.ogg": "un hot-dog",
"hound.ogg": "un chien de chasse",
"house.ogg": "une maison",
"howl.ogg": "un hurlement",
"hug.ogg": "un calin",
"huge.ogg": "énorme",
"hummingbird.ogg": "un colibri",
"hunchbacked.ogg": "bossu",
"hunter.ogg": "un chasseur",
"husband.ogg": "un mari",
"hut.ogg": "une hutte",
"hyena.ogg": "une hyène",
"ice.ogg": "un glaçon",
"iceberg.ogg": "un iceberg",
"iguana.ogg": "un iguane",
"ill.ogg": "malade",
"ink.ogg": "de l'encre",
"island.ogg": "une île",
"jacket.ogg": "une veste",
"jaguar.ogg": "un jaguar",
"jam.ogg": "une confiture",
"jay.ogg": "un geai",
"jelly.ogg": "une gelée",
"jellyfish.ogg": "une méduse",
"jewel.ogg": "un bijou",
"job.ogg": "un travail",
"jockey.ogg": "un jockey",
"jog.ogg": "un joggeur",
"joy.ogg": "être content",
"judge.ogg": "un juge",
"judo.ogg": "une judokate",
"juggler.ogg": "une jongleuse",
"juice.ogg": "un jus",
"jump.ogg": "sauter",
"kangaroo.ogg": "un kangourou",
"keel.ogg": "une quille",
"kernel.ogg": "un noyau",
"keyboard.ogg": "un clavier",
"kimono.ogg": "un kimono",
"king.ogg": "un roi",
"kiss.ogg": "un baiser",
"kitchen.ogg": "une cuisine",
"kite.ogg": "un cerf-volant",
"kitten.ogg": "un chaton",
"kiwi.ogg": "un kiwi",
"knee.ogg": "un genou",
"kneel.ogg": "s'agenouiller",
"knife.ogg": "un couteau",
"knight.ogg": "un chevalier",
"knit.ogg": "tricoter",
"knot.ogg": "un noeud",
"koala.ogg": "un koala",
"lad.ogg": "un garçon",
"lady.ogg": "une dame",
"ladybug.ogg": "une coccinelle",
"lake.ogg": "un lac",
"lama.ogg": "un lama",
"lamb.ogg": "un agneau",
"lamp.ogg": "une lampe",
"land.ogg": "un terrain",
"lane.ogg": "le chemin",
"lasso.ogg": "un lasso",
"laugh.ogg": "rire",
"lava.ogg": "la lave",
"lawn.ogg": "la pelouse",
"lawyer.ogg": "un avocat",
"leaf.ogg": "une feuille",
"ledge.ogg": "un rebord",
"leek.ogg": "un poireau",
"left.ogg": "la gauche",
"leg.ogg": "la jambe",
"lemon.ogg": "un citron",
"lemonade.ogg": "une limonade",
"lemur.ogg": "un lémur",
"leopard.ogg": "un léopard",
"lettuce.ogg": "une laitue",
"librarian.ogg": "une bibliothécaire",
"lick.ogg": "lécher",
"lid.ogg": "un couvercle",
"lift.ogg": "soulever",
"light.ogg": "la lumière",
"lighthouse.ogg": "un phare",
"lightning.ogg": "la foudre",
"lilac.ogg": "un lilas",
"lime.ogg": "un citron vert",
"line.ogg": "un code-barres",
"link.ogg": "un chaînon",
"lion.ogg": "un lion",
"lion_cub.ogg": "un lionceau",
"lip.ogg": "une lèvre",
"liquid.ogg": "un liquide",
"lizard.ogg": "un lézard",
"lobster.ogg": "un homard",
"log.ogg": "une bûche",
"look.ogg": "regarder",
"lunch.ogg": "un casse-croûte",
"mad.ogg": "être furieux",
"magic.ogg": "un magicien",
"magnet.ogg": "un aimant",
"magnifying_glass.ogg": "une loupe",
"magpie.ogg": "une pie",
"mail.ogg": "une enveloppe",
"man.ogg": "un homme",
"mane.ogg": "une crinière",
"mango.ogg": "une mangue",
"map.ogg": "une carte",
"maple.ogg": "un érable",
"marble.ogg": "une bille",
"mashed_potatoes.ogg": "une purée",
"mask.ogg": "un masque",
"mast.ogg": "un mât",
"mat.ogg": "une natte",
"match.ogg": "une allumette",
"mate.ogg": "un camarade",
"mattress.ogg": "un matelas",
"mauve.ogg": "violet",
"meal.ogg": "un repas",
"meat.ogg": "de la viande",
"mechanic.ogg": "un mécanicien",
"medal.ogg": "une médaille",
"meet.ogg": "rencontrer",
"melon.ogg": "un melon",
"merry-go-round.ogg": "un tourniquet",
"mice.ogg": "des souris",
"microphone.ogg": "un micro",
"milk.ogg": "du lait",
"mill.ogg": "un moulin",
"mimosa.ogg": "un mimosa",
"mirror.ogg": "un miroir",
"mixer.ogg": "un mixer",
"mole.ogg": "une taupe",
"mom.ogg": "une maman",
"moon.ogg": "une lune",
"moose.ogg": "un élan",
"mop.ogg": "un balai",
"mosque.ogg": "une mosquée",
"mosquito.ogg": "un moustique",
"mother.ogg": "une mère",
"motorcycle.ogg": "une moto",
"mountain.ogg": "une montagne",
"mouse.ogg": "une souris",
"mouth.ogg": "une bouche",
"movie.ogg": "un film",
"mower.ogg": "une tondeuse",
"mud.ogg": "la boue",
"mug.ogg": "une tasse",
"mule.ogg": "une mule",
"muscle.ogg": "un muscle",
"mushroom.ogg": "un champignon",
"music.ogg": "la musique",
"musician.ogg": "un musicien",
"naked.ogg": "nu",
"nap.ogg": "une sieste",
"navel.ogg": "le nombril",
"neck.ogg": "le cou",
"necklace.ogg": "un collier",
"needle.ogg": "une aiguille",
"nest.ogg": "un nid",
"net.ogg": "un filet",
"newspaper.ogg": "un journal",
"night.ogg": "la nuit",
"nightgown.ogg": "une chemise de nuit",
"nose.ogg": "le nez",
"nostril.ogg": "la narine",
"notebook.ogg": "un cahier",
"number.ogg": "un nombre",
"nun.ogg": "une religieuse",
"nurse.ogg": "une infirmière",
"nurse_male.ogg": "un infirmier",
"nut.ogg": "une cacahuète",
"oar.ogg": "une rame",
"ocean.ogg": "un océan",
"office.ogg": "un bureau",
"olive.ogg": "une olive",
"on.ogg": "sur",
"onion.ogg": "un oignon",
"open.ogg": "ouvert",
"opossum.ogg": "un opossum",
"orange-color.ogg": "orange",
"orange.ogg": "une orange",
"orchid.ogg": "une orchidée",
"ostrich.ogg": "une autruche",
"otter.ogg": "une loutre",
"owl.ogg": "un hibou",
"ox.ogg": "un boeuf",
"oyster.ogg": "une huître",
"pacifier.ogg": "une tétine",
"page.ogg": "une page",
"pair.ogg": "une paire",
"pajamas.ogg": "un pyjama",
"palm_tree.ogg": "un palmier",
"pan.ogg": "une poêle",
"panda.ogg": "un panda",
"panther.ogg": "une panthère",
"panties.ogg": "une culotte",
"pants.ogg": "un pantalon",
"papaya.ogg": "une papaye",
"paper.ogg": "un papier",
"parachute.ogg": "un parachute",
"parakeet.ogg": "une perruche",
"parrot.ogg": "un perroquet",
"patch.ogg": "une pièce",
"path.ogg": "un chemin",
"paw.ogg": "une patte",
"pea.ogg": "un petit pois",
"peach.ogg": "une pêche",
"peacock.ogg": "un paon",
"peak.ogg": "un pic",
"pear.ogg": "une poire",
"pearl.ogg": "une perle",
"peck.ogg": "picorer",
"pedal.ogg": "une pédale",
"pelican.ogg": "un pélican",
"pen.ogg": "un stylo",
"pencil.ogg": "un crayon",
"peony.ogg": "une pivoine",
"people.ogg": "les gens",
"pepper.ogg": "le poivre",
"peppers.ogg": "un poivron",
"petal.ogg": "un pétale",
"phone.ogg": "un téléphone",
"piano.ogg": "un piano",
"picture.ogg": "une photo",
"pie.ogg": "une tarte",
"pig.ogg": "un cochon",
"pigeon.ogg": "un pigeon",
"pill.ogg": "une pilule",
"pillow.ogg": "un oreiller",
"pilot.ogg": "un pilote",
"pine.ogg": "un pin",
"pine_cone.ogg": "une pomme de pin",
"pink.ogg": "rose",
"pip.ogg": "un pépin",
"pipe.ogg": "une pipe",
"piranha.ogg": "un piranha",
"pirate.ogg": "un pirate",
"pizza.ogg": "une pizza",
"plane.ogg": "un avion",
"planet.ogg": "une planète",
"plant.ogg": "une plante",
"plate.ogg": "une assiette",
"play.ogg": "jouer",
"pliers.ogg": "une pince",
"plow.ogg": "labourer",
"plum.ogg": "une prune",
"plumber.ogg": "un plombier",
"pocket.ogg": "une poche",
"pod.ogg": "une cosse",
"pole.ogg": "un poteau",
"police.ogg": "un policier",
"pompon.ogg": "un pompon",
"pond.ogg": "un étang",
"pony.ogg": "un poney",
"pool.ogg": "une piscine",
"popcorn.ogg": "du pop-corn",
"pope.ogg": "le pape",
"porthole.ogg": "un hublot",
"post.ogg": "une boîte aux lettres",
"pot.ogg": "un pot",
"potato.ogg": "une pomme de terre",
"pounce.ogg": "bondir",
"president.ogg": "le président",
"pretty.ogg": "jolie",
"price.ogg": "le prix",
"priest.ogg": "un prêtre",
"prince.ogg": "un prince",
"princess.ogg": "une princesse",
"prison.ogg": "une prison",
"prisoner.ogg": "un prisonnier",
"prize.ogg": "un trophée",
"pug.ogg": "un bouledogue",
"pull.ogg": "tirer",
"pullover.ogg": "un pull-over",
"pumpkin.ogg": "une citrouille",
"puppy.ogg": "un chiot",
"pyramid.ogg": "une pyramide",
"quarrel.ogg": "se quereller",
"queen.ogg": "une reine",
"question.ogg": "une question",
"quilt.ogg": "une couette",
"quiz.ogg": "un quiz",
"rabbit.ogg": "un lapin",
"rabbit_baby.ogg": "un lapereau",
"race.ogg": "une course",
"radio.ogg": "une radio",
"radish.ogg": "un radis",
"raft.ogg": "un radeau",
"rage.ogg": "la rage",
"rain.ogg": "la pluie",
"raincoat.ogg": "un imperméable",
"rake.ogg": "un râteau",
"ramp.ogg": "une rampe",
"raspberry.ogg": "une framboise",
"rat.ogg": "un rat",
"razor.ogg": "un rasoir",
"read.ogg": "lire",
"red.ogg": "rouge",
"reptile.ogg": "un reptile",
"rhinoceros.ogg": "un rhinocéros",
"rice.ogg": "le riz",
"rifle.ogg": "un fusil",
"right.ogg": "la droite",
"rip.ogg": "déchirer",
"rise.ogg": "augmenter",
"river.ogg": "une rivière",
"road.ogg": "une route",
"roast.ogg": "un rôti",
+ "robe.ogg": "une robe",
"robot.ogg": "un robot",
"rock.ogg": "un caillou",
"rocket.ogg": "une fusée",
"rolling_pin.ogg": "un rouleau",
"roof.ogg": "un toit",
"room.ogg": "une pièce",
"root.ogg": "une racine",
"rope.ogg": "une corde",
"rose.ogg": "une rose",
"round.ogg": "un rond",
"rowing.ogg": "un aviron",
"royal.ogg": "royal",
"rug.ogg": "un tapis",
"run.ogg": "courir",
"sad.ogg": "triste",
"saddle.ogg": "une selle",
"sail.ogg": "un voilier",
"sailor.ogg": "un marin",
"salamander.ogg": "une salamandre",
"salmon.ogg": "un saumon",
"sand.ogg": "le sable",
"sandals.ogg": "une sandale",
"sandwich.ogg": "un sandwich",
"sash.ogg": "une ceinture",
"sauce.ogg": "une sauce",
"sausage.ogg": "une saucisse",
"scale.ogg": "une balance",
"scar.ogg": "une cicatrice",
"scare.ogg": "effrayé",
"scarf.ogg": "une écharpe",
"school.ogg": "une école",
"school_bag.ogg": "un sac",
"science.ogg": "la science",
"scissors.ogg": "un ciseau",
"scorpion.ogg": "un scorpion",
"scratch.ogg": "griffer",
"scream.ogg": "crier",
"screw.ogg": "une vis",
"screwdriver.ogg": "un tournevis",
"scribble.ogg": "gribouiller",
"sea.ogg": "la mer",
"seat.ogg": "un siège",
"see.ogg": "voir",
"seed.ogg": "une graine",
"shadow.ogg": "une ombre",
"shake.ogg": "secouer",
"shark.ogg": "un requin",
"shave.ogg": "se raser",
"shed.ogg": "un hangar",
"sheep.ogg": "un mouton",
"shelf.ogg": "une étagère",
"shell.ogg": "un coquillage",
"ship.ogg": "un bateau",
"shirt.ogg": "une chemise",
"shoe.ogg": "une chaussure",
"shoelace.ogg": "un lacet",
"shop.ogg": "un magasin",
"shore.ogg": "un rivage",
"short.ogg": "un short",
"shovel.ogg": "une pelle",
"shower.ogg": "une douche",
"shrimp.ogg": "une crevette",
"shrub.ogg": "un arbuste",
"shut.ogg": "fermé",
"shutter.ogg": "un volet",
"sick.ogg": "malade",
"sidewalk.ogg": "un trottoir",
"sign.ogg": "un panneau",
"sing.ogg": "chanter",
"sink.ogg": "un évier",
"sip.ogg": "siroter",
"sister.ogg": "une soeur",
"sit.ogg": "s'asseoir",
"skate.ogg": "un skate",
"skeleton.ogg": "un squelette",
"ski.ogg": "le ski",
"skimmer.ogg": "une écumoire",
"skin.ogg": "la peau",
"skirt.ogg": "une jupe",
"skunk.ogg": "une mouffette",
"sky.ogg": "le ciel",
"slam.ogg": "smasher",
"sled.ogg": "une luge",
"sleep.ogg": "dormir",
"sleeve.ogg": "une manche",
"sleigh.ogg": "un traîneau",
"slide.ogg": "un toboggan",
"slim.ogg": "mince",
"slime.ogg": "la bave",
"slippers.ogg": "un chausson",
"slope.ogg": "une pente",
"sloppy.ogg": "trempé",
"slot.ogg": "une fente",
"sloth.ogg": "un paresseux",
"slug.ogg": "une limace",
"small.ogg": "le petit",
"smell.ogg": "sentir",
"smile.ogg": "un sourire",
"smock.ogg": "une blouse",
"smoke.ogg": "la fumée",
"smooch.ogg": "s'embrasser",
"snail.ogg": "un escargot",
"snake.ogg": "un serpent",
"sneaker.ogg": "une basket",
"sniff.ogg": "renifler",
"snow.ogg": "la neige",
"soap.ogg": "le savon",
"sob.ogg": "sangloter",
"sock.ogg": "une chaussette",
"soldier.ogg": "un soldat",
"sole.ogg": "une sole",
"sole_shoe.ogg": "une semelle",
"son.ogg": "un fils",
"soup.ogg": "une soupe",
"spade.ogg": "une bêche",
"spaghetti.ogg": "un spaghetti",
"spark.ogg": "une étincelle",
"sparrow.ogg": "un moineau",
"spatula.ogg": "une spatule",
"speak.ogg": "parler",
"spear.ogg": "une lance",
"spice.ogg": "un épice",
"spider.ogg": "une araignée",
"spider_web.ogg": "une toile d'araignée",
"spike.ogg": "un hérisson",
"spill.ogg": "répandre",
"spinach.ogg": "un épinard",
"spine.ogg": "une colonne vertébrale",
"spinning_top.ogg": "une toupie",
"splash.ogg": "un jet",
"splatter.ogg": "une éclaboussure",
"sponge.ogg": "une éponge",
"spool.ogg": "une bobine",
"spoon.ogg": "une cuillère",
"sport.ogg": "le sport",
"spot.ogg": "une tâche",
"spray.ogg": "pulvériser",
"spread.ogg": "étaler",
"spring.ogg": "bondir",
"spring_season.ogg": "le printemps",
"square.ogg": "un carré",
"squash.ogg": "une courge",
"squat.ogg": "s'accroupir",
"squid.ogg": "un calmar",
"squirrel.ogg": "un écureuil",
"stack.ogg": "une pile",
"stage.ogg": "une scène",
"staircase.ogg": "un escalier",
"stamp.ogg": "un timbre",
"stand.ogg": "debout",
"star.ogg": "une étoile",
"stare.ogg": "un regard",
"starfish.ogg": "une étoile de mer",
"steam.ogg": "la vapeur",
"steep.ogg": "raide",
"steeple.ogg": "un clocher",
"stem.ogg": "une tige",
"step.ogg": "une marche",
"stew.ogg": "un ragoût",
"stick.ogg": "une branche",
"sting.ogg": "piquer",
"stinky.ogg": "puant",
"stitch.ogg": "coudre",
"stomach.ogg": "un estomac",
"stone.ogg": "une pierre",
"stop.ogg": "arrêter",
"store.ogg": "un magasin",
"stove.ogg": "une cuisinière",
"straight.ogg": "droit",
"strainer.ogg": "une passoire",
"straw.ogg": "une paille",
"strawberry.ogg": "une fraise",
"stream.ogg": "une rivière",
"street.ogg": "une rue",
"stretch.ogg": "s'étirer",
"string.ogg": "une ficelle",
"stripe.ogg": "une bande",
"strong.ogg": "fort",
"student.ogg": "un étudiant",
"study.ogg": "étudier",
"stump.ogg": "une souche",
"sugar.ogg": "un sucre",
"suit.ogg": "un costume",
"suitcase.ogg": "une valise",
"summer.ogg": "un été",
"summit.ogg": "un sommet",
"sun.ogg": "le soleil",
"swan.ogg": "un cygne",
"sweat.ogg": "transpirer",
"sweatshirt.ogg": "un sweat-shirt",
"swim.ogg": "nager",
"table.ogg": "une table",
"tablecloth.ogg": "une nappe",
"tadpole.ogg": "un têtard",
"tag.ogg": "une étiquette",
"tail.ogg": "une queue",
"tall.ogg": "grand",
"tape_measure.ogg": "un mètre",
"taxi.ogg": "un taxi",
"teach.ogg": "enseigner",
"teacher.ogg": "un professeur",
"tear.ogg": "déchirer",
"teddy.ogg": "une peluche",
"teeth.ogg": "les dents",
"television.ogg": "une télévision",
"temple.ogg": "un temple",
"tennis.ogg": "le tennis",
"tent.ogg": "une tente",
"text.ogg": "un texte",
"thick.ogg": "épais",
"thief.ogg": "un voleur",
"thigh.ogg": "une cuisse",
"think.ogg": "penser",
"thread.ogg": "une bobine",
"throat.ogg": "la gorge",
"throw.ogg": "envoyer",
"thumb.ogg": "un pouce",
"ticket.ogg": "un billet",
"tiger.ogg": "un tigre",
"time.ogg": "le temps",
"tin.ogg": "une conserve",
"tire.ogg": "un pneu",
"tired.ogg": "fatigué",
"tissue.ogg": "un mouchoir",
"to_drink.ogg": "boire",
"toad.ogg": "un crapaud",
"toaster.ogg": "un grille-pain",
"toe.ogg": "un orteil",
"toilet.ogg": "les toilettes",
"tomatoe.ogg": "une tomate",
"tongs.ogg": "une pince",
"tongue.ogg": "une langue",
"tool.ogg": "un outil",
"top.ogg": "dessus",
"torch.ogg": "une torche",
"touch.ogg": "toucher",
"towel.ogg": "une serviette",
"toy.ogg": "un jouet",
"trail.ogg": "une piste",
"train.ogg": "un train",
"train_station.ogg": "une gare",
"trap.ogg": "un piège",
"trash.ogg": "la saleté",
"tray.ogg": "un plateau",
"treat.ogg": "un bonbon",
"tree.ogg": "un arbre",
"triangle.ogg": "un triangle",
"tribe.ogg": "une tribu",
"trip.ogg": "un voyage",
"truck.ogg": "un camion",
"tube.ogg": "un rouge à lèvres",
"tulip.ogg": "une tulipe",
"tune.ogg": "un air de musique",
"turkey.ogg": "une dinde",
"turnip.ogg": "un navet",
"turtle.ogg": "une tortue",
"tusk.ogg": "une défense",
"twin_boys.ogg": "un jumeau",
"twin_girls.ogg": "une jumelle",
"umbrella.ogg": "un parapluie",
"under.ogg": "sous",
"uniform.ogg": "un uniforme",
"van.ogg": "un fourgon",
+ "vapor.ogg": "la vapeur",
"vase.ogg": "un vase",
"vegetable.ogg": "un légume",
"vein.ogg": "une veine",
"verdure.ogg": "la verdure",
"vest.ogg": "un gilet",
"vet.ogg": "un vétérinaire",
"viper.ogg": "une vipère",
"vowel.ogg": "une voyelle",
"vulture.ogg": "un vautour",
"wag.ogg": "remuer la queue",
"walk.ogg": "marcher",
"wall.ogg": "un mur",
"walnut.ogg": "une noix",
"wart.ogg": "une verrue",
"wash.ogg": "se laver",
"wasp.ogg": "une guêpe",
"watch.ogg": "une montre",
"water.ogg": "de l'eau",
"wave.ogg": "une vague",
"wedding.ogg": "un mariage",
"wedge.ogg": "une cale",
"weight.ogg": "un poids",
"wet.ogg": "humide",
"whale.ogg": "une baleine",
"wheat.ogg": "le blé",
"wheel.ogg": "une roue",
"whisk.ogg": "un fouet",
"whisper.ogg": "chuchoter",
"white.ogg": "blanc",
"wide.ogg": "large",
"wife.ogg": "une épouse",
"wig.ogg": "une perruque",
"win.ogg": "gagner",
"wind.ogg": "le vent",
"window.ogg": "une fenêtre",
"window_glass.ogg": "une vitre",
"wing.ogg": "une aile",
"winter.ogg": "un hiver",
"wolf.ogg": "un loup",
"woman.ogg": "une femme",
"wood.ogg": "le bois",
"word.ogg": "un mot",
"worker.ogg": "un travailleur",
"world.ogg": "le monde",
"wreath.ogg": "une couronne",
"wrench.ogg": "une clé",
"wrist.ogg": "un poignet",
"write.ogg": "écrire",
"yellow.ogg": "jaune",
"yogurt.ogg": "un yaourt",
"yum.ogg": "miam-miam",
"zebra.ogg": "un zèbre",
"zipper.ogg": "une fermeture éclair",
"zoo.ogg": "un zoo"
}
diff --git a/src/activities/lang/resource/content-sk.json b/src/activities/lang/resource/content-sk.json
index 6361c1470..a92ac2478 100644
--- a/src/activities/lang/resource/content-sk.json
+++ b/src/activities/lang/resource/content-sk.json
@@ -1,1062 +1,1092 @@
{
"10.ogg": "desať",
"11.ogg": "jedenásť",
"12.ogg": "dvanásť",
"16.ogg": "šestnásť",
"U0030.ogg": "nula",
"U0031.ogg": "jedna",
"U0032.ogg": "dva",
"U0033.ogg": "tri",
"U0034.ogg": "štyri",
"U0035.ogg": "päť",
"U0036.ogg": "šesť",
"U0037.ogg": "sedem",
"U0038.ogg": "osem",
"U0039.ogg": "deväť",
"accountant.ogg": "účtovník",
"ache.ogg": "bolesť",
"acorn.ogg": "žaluď",
"actor.ogg": "herec",
"air_horn.ogg": "klaxón",
"alarmclock.ogg": "budík",
"alligator.ogg": "aligátor",
"alphabet.ogg": "abeceda",
"anchor.ogg": "kotva",
"angel.ogg": "anjel",
"angry.ogg": "nahnevaný",
"animal.ogg": "zviera",
"ankle.ogg": "členok",
"ant.ogg": "mravec",
"anteater.ogg": "mravčiar",
"antelope.ogg": "antilopa",
"apple.ogg": "jablko",
"apple_tree.ogg": "jabloň",
"appliance.ogg": "spotrebič",
"apricot.ogg": "marhuľa",
"arm.ogg": "rameno",
"armchair.ogg": "kreslo",
"artichoke.ogg": "artičoka",
"artist.ogg": "umelec",
"asparagus.ogg": "špargľa",
"astronaut.ogg": "astronaut",
"athlete.ogg": "atlét",
"avocado.ogg": "avokádo",
"ax.ogg": "sekera",
"baby_bottle.ogg": "detská fľaša",
"back.ogg": "chrbát",
"badge.ogg": "odznak",
"bag.ogg": "taška",
"bait.ogg": "návnada",
"balance.ogg": "rovnováha",
"bald.ogg": "plešatý",
"ball.ogg": "lopta",
"ball_of_yarn.ogg": "klbko priadze",
"ball_soccer.ogg": "futbalová lopta",
"ballet.ogg": "balet",
"bank.ogg": "banka",
"banker_female.ogg": "zamestnankyňa banky",
"bark.ogg": "brechať",
"barn.ogg": "stodola",
"bat.ogg": "netopier",
"bath.ogg": "vaňa",
"bathing_suit.ogg": "plavky",
"bay.ogg": "zátoka",
"beach.ogg": "pláž",
"bean.ogg": "fazuľa",
"bear.ogg": "medveď",
"beard.ogg": "brada",
"beat.ogg": "biť sa",
"beaver.ogg": "bobor",
"bed.ogg": "posteľ",
"bedroom.ogg": "spálňa",
"bee.ogg": "včela",
"beetle.ogg": "chrobák",
"beg.ogg": "žobrať",
"behind.ogg": "za",
"bell.ogg": "zvonec",
"belly.ogg": "brucho",
"bench.ogg": "lavička",
"bib.ogg": "podbradník",
"big.ogg": "veľký",
"big_top.ogg": "šapitó",
"bike.ogg": "bicykel",
"bird.ogg": "vták",
"bit.ogg": "kúsok",
"bite.ogg": "kúsať",
"black.ogg": "čierna",
"blackberry.ogg": "černica",
"blackbird.ogg": "drozd",
"blade.ogg": "čepeľ",
"blind.ogg": "slepý",
"blink.ogg": "mrkať",
"block.ogg": "kocka",
"blond.ogg": "plavý",
"blue.ogg": "modrá",
"blueberry.ogg": "čučoriedka",
"blush.ogg": "červenať sa",
"board.ogg": "tabuľka",
"boat.ogg": "čln",
"boil.ogg": "vrieť",
"bolt.ogg": "matica",
"bomb.ogg": "bomba",
"bone.ogg": "kosť",
"book.ogg": "kniha",
"bookcase.ogg": "knižnica",
"bottom.ogg": "zadok",
"box.ogg": "krabica",
"boxer.ogg": "boxer",
"boy.ogg": "chlapec",
"braid.ogg": "vrkoč",
"brain.ogg": "mozog",
"branch.ogg": "vetvička",
"bread.ogg": "chlieb",
"break.ogg": "zlomiť",
"breast.ogg": "prsia",
"brick.ogg": "tehla",
"bricklayer.ogg": "murár",
"bride.ogg": "nevesta",
"bridge.ogg": "most",
"bright.ogg": "svetlý",
"broccoli.ogg": "brokolica",
"brother.ogg": "brat",
"brown.ogg": "hnedý",
"brush.ogg": "štetec",
"bubble.ogg": "bublina",
"bucket.ogg": "vedro",
"bud.ogg": "púčik",
"buffalo.ogg": "býk",
"bug.ogg": "hmyz",
"bulb.ogg": "žiarovka",
"bull.ogg": "býk",
"bump.ogg": "hrča",
"bun.ogg": "žemľa",
"bus.ogg": "autobus",
"bush.ogg": "krík",
"butcher.ogg": "mäsiar",
"butter.ogg": "maslo",
"butterfly.ogg": "motýľ",
"button.ogg": "gombík",
"cabbage.ogg": "kapusta",
"cabin.ogg": "chalúpka",
"cacao.ogg": "kakao",
"cactus.ogg": "kaktus",
"cage.ogg": "klietka",
"cake.ogg": "torta",
"call.ogg": "volať",
"camel.ogg": "ťava",
"camera.ogg": "fotoaparát",
"camp.ogg": "kempovať",
+ "can.ogg": "plechovka",
"canary.ogg": "kanárik",
"candle.ogg": "sviečka",
"candy.ogg": "sladkosť",
"cane.ogg": "palička",
"canoe.ogg": "kanoe",
"canon.ogg": "kanón",
"canyon.ogg": "kaňon",
"cap.ogg": "čapica",
"cape.ogg": "plášť",
"car.ogg": "auto",
"carafe.ogg": "karafa",
"card.ogg": "kartička",
"carnival.ogg": "karneval",
"carpenter.ogg": "tesár",
"carpet.ogg": "koberec",
"carrot.ogg": "mrkva",
"cart.ogg": "nákupný vozík",
"cash.ogg": "hotovosť",
"castle.ogg": "zámok",
"cat.ogg": "kocúr",
"cat_female.ogg": "mačka",
"catch.ogg": "chytiť",
"caterpillar.ogg": "húsenica",
"cauldron.ogg": "kotol",
"cauliflower.ogg": "karfiol",
+ "cave.ogg": "jaskyňa",
"cavern.ogg": "jaskyňa",
"celery.ogg": "zeler",
"centipede.ogg": "stonožka",
"cereal.ogg": "obilnina",
"chain.ogg": "reťaz",
"chair.ogg": "stolička",
"chalk.ogg": "krieda",
"chameleon.ogg": "chameleón",
"chandelier.ogg": "luster",
"chat.ogg": "diskutovať",
"cheek.ogg": "líce",
"cheer.ogg": "povzbudzovať",
"cheese.ogg": "syr",
"chef.ogg": "šéfkuchár",
"cherry.ogg": "čerešňa",
"chest.ogg": "truhlica",
"chick.ogg": "kuriatko",
"chicken.ogg": "kura",
"child.ogg": "dieťa",
"chimney.ogg": "komín",
"chimp.ogg": "šimpanz",
"chin.ogg": "brada",
"chocolate.ogg": "čokoláda",
"chop.ogg": "krájať",
"chores.ogg": "drobná práca",
"christmas.ogg": "Vianoce",
"cigar.ogg": "cigara",
"circus.ogg": "cirkus",
"city.ogg": "mesto",
"clam.ogg": "mušľa",
"clap.ogg": "tlesknutie",
"class.ogg": "trieda",
"claw.ogg": "pazúr",
"clay.ogg": "hlina",
"clean.ogg": "čistý",
"cleaning_lady.ogg": "upratovačka",
"cliff.ogg": "útes",
"climb.ogg": "šplhať sa",
"clock.ogg": "hodiny",
"cloth.ogg": "handrička",
"clothes_hanger.ogg": "vešiak",
"cloud.ogg": "oblak",
"cloudy.ogg": "oblačno",
"clover.ogg": "štvorlístok",
"clown.ogg": "klaun",
"coach.ogg": "tréner",
"coast.ogg": "pobrežie",
"coat.ogg": "kabát",
"cobra.ogg": "kobra",
"coconut.ogg": "kokosový orech",
"cod.ogg": "treska",
"coffee.ogg": "káva",
"coin.ogg": "minca",
"cold.ogg": "zima",
"color.ogg": "farba",
"colt.ogg": "žriebä",
"comb.ogg": "hrebeň",
"cone.ogg": "kužeľ",
+ "cook.ogg": "variť",
"cookie.ogg": "sušienka",
"cork.ogg": "zátka",
"corn.ogg": "kukurica",
"couch.ogg": "gauč",
"cough.ogg": "kašľať",
"couple.ogg": "dvojica",
"cow.ogg": "krava",
"cowboy.ogg": "kovboj",
"crab.ogg": "krab",
"cradle.ogg": "kolíska",
"craft.ogg": "remeslo",
"crawl.ogg": "plaziť sa",
"crazy.ogg": "bláznivý",
"creek.ogg": "potôčik",
"crepe.ogg": "palacinka",
"crib.ogg": "jasličky",
"croak.ogg": "kvákať",
"crocodile.ogg": "krokodíl",
"cross.ogg": "kríž",
"crow.ogg": "vrana",
"crown.ogg": "koruna",
"crumb.ogg": "omrvinka",
"crust.ogg": "kôrka",
"cry.ogg": "plakať",
"crystal.ogg": "kryštál",
"cube.ogg": "kocka",
"cucumber.ogg": "uhorka",
"curtain.ogg": "záves",
"cut.ogg": "strihať",
"cute.ogg": "rozkošný",
"dad.ogg": "otecko",
"daffodil.ogg": "narcis",
"daisy.ogg": "margaréta",
"dam.ogg": "priehrada",
"dance.ogg": "tancovať",
"dandelion.ogg": "púpava",
"dart_board.ogg": "terčová doska",
"date_fruit.ogg": "datle",
"deer.ogg": "jeleň",
"den.ogg": "nora",
"desert.ogg": "púšť",
"desk.ogg": "stôl",
"dessert.ogg": "dezert",
"diamond.ogg": "diamant",
"dig.ogg": "kopať",
"dirt.ogg": "zemina",
"dirty.ogg": "špinavý",
"dish.ogg": "riad",
"dishcloth.ogg": "utierka na riad",
"dive.ogg": "potápať sa",
"doctor.ogg": "doktor",
"doe.ogg": "srna",
"dog.ogg": "pes",
"doll.ogg": "bábika",
"dolphin.ogg": "delfín",
"domino.ogg": "domino",
"door.ogg": "dvere",
"doormat.ogg": "rohožka",
"dot.ogg": "bodka",
"doughnut.ogg": "šiška",
"dove.ogg": "holubica",
"dragon.ogg": "drak",
"dragonfly.ogg": "vážka",
"draw.ogg": "kresliť",
"drawer.ogg": "zásuvka",
"dream.ogg": "sen",
"dress.ogg": "šaty",
"drink.ogg": "nápoj",
"drip.ogg": "kvapka",
"drive.ogg": "šoférovať",
"drool.ogg": "slintať",
"drum.ogg": "bubon",
"dry.ogg": "schnúť",
"duck.ogg": "káčer",
"duck_mother.ogg": "kačka",
"dune.ogg": "duna",
"dwarf.ogg": "trpaslík",
"eagle.ogg": "orol",
"ear.ogg": "ucho",
"earth.ogg": "Zem",
"eat.ogg": "jesť",
"egg.ogg": "vajce",
"eggplant.ogg": "baklažán",
"elbow.ogg": "lakeť",
"electrician.ogg": "elektrikár",
"elk.ogg": "los",
"empty.ogg": "prázdny",
"engine.ogg": "motor",
"engineer.ogg": "strojár",
"eraser.ogg": "guma",
"explore.ogg": "prieskumníci",
"eyelash.ogg": "mihalnica",
"eyes.ogg": "oči",
"face.ogg": "tvár",
"fair.ogg": "kolotoč",
"fairy.ogg": "víla",
+ "fall.ogg": "padať",
"fall_season.ogg": "jeseň",
"family.ogg": "rodina",
"fan.ogg": "ventilátor",
"farm.ogg": "farma",
"farmer.ogg": "farmár",
"fat.ogg": "tučný",
"faucet.ogg": "kohútik",
"fawn.ogg": "srnčiatko",
+ "fear.ogg": "strach",
"feast.ogg": "hostina",
"feather.ogg": "pierko",
"feed.ogg": "kŕmiť",
"femur.ogg": "stehenná kosť",
"fetch.ogg": "priniesť",
"fig.ogg": "figa",
"fin.ogg": "plutva",
"find.ogg": "nájsť",
"finger.ogg": "prst",
"fire.ogg": "oheň",
"fire_extinguisher.ogg": "hasiaci prístroj",
"fireman.ogg": "požiarnik",
"fish.ogg": "ryba",
"fisherman.ogg": "rybár",
"fist.ogg": "päsť",
"flacon.ogg": "fľaštička",
"flag.ogg": "vlajka",
"flame.ogg": "plameň",
"flamingo.ogg": "plameniak",
"flash.ogg": "baterka",
"flat.ogg": "byt",
"flies.ogg": "mucha",
"float.ogg": "nadnášať",
"flour.ogg": "múka",
"flower.ogg": "kvetina",
"fluff.ogg": "chumáčik",
"flute.ogg": "flauta",
"fly.ogg": "letieť",
"foam.ogg": "pena",
"foot.ogg": "chodidlo",
"forest.ogg": "les",
"fork.ogg": "vidlička",
"fountain.ogg": "fontána",
"fox.ogg": "líška",
"freeze.ogg": "mrznúť",
"friend.ogg": "kamaráti",
"fries.ogg": "hranolky",
"frog.ogg": "žaba",
"front.ogg": "predok",
"fruit.ogg": "ovocie",
"fudge.ogg": "karamel",
"full.ogg": "plný",
"fur.ogg": "kožušina",
"game.ogg": "hra",
"garage.ogg": "garáž",
"garden.ogg": "záhrada",
"garlic.ogg": "cesnak",
+ "gem.ogg": "drahokam",
"giant.ogg": "silák",
"gift.ogg": "darček",
"giraffe.ogg": "žirafa",
"girl.ogg": "dievča",
"glass.ogg": "pohár",
"glasses.ogg": "okuliare",
"glove.ogg": "rukavica",
"glue.ogg": "lepidlo",
"gnome.ogg": "škriatok",
"goat.ogg": "koza",
"golden.ogg": "zlatý",
"golf.ogg": "golf",
"goose.ogg": "hus",
"gorilla.ogg": "gorila",
"grain.ogg": "obilie",
"grandmother.ogg": "babička",
"grape.ogg": "hrozno",
"grapefruit.ogg": "grep",
"grass.ogg": "tráva",
"grave.ogg": "hrob",
"gray.ogg": "šedý",
"green.ogg": "zelený",
"grill.ogg": "grilovať",
"grin.ogg": "úškrn",
"ground.ogg": "zem",
"growl.ogg": "vrčať",
+ "guignol.ogg": "guignol",
"guinea_pig.ogg": "morské prasiatko",
"gum.ogg": "žuvačka",
"hair.ogg": "vlasy",
"hair_dryer.ogg": "sušič vlasov",
"half.ogg": "polovica",
"ham.ogg": "šunka",
"hamburger.ogg": "hamburger",
"hammer.ogg": "kladivo",
"hand.ogg": "ruka",
"handlebar.ogg": "rúčka",
"happy.ogg": "šťastný",
"harp.ogg": "harfa",
"hat.ogg": "klobúk",
"hatch.ogg": "vyliahnuť sa",
"hay.ogg": "seno",
"head.ogg": "hlava",
"hear.ogg": "počúvať",
"heat.ogg": "teplo",
"hedge.ogg": "živý plot",
"hedgehog.ogg": "ježko",
"heel.ogg": "opätok",
"helmet.ogg": "prilba",
"hen.ogg": "sliepka",
"herd.ogg": "stádo",
"high.ogg": "vysoký",
"hike.ogg": "pešia túra",
"hill.ogg": "kopec",
"hip.ogg": "bok",
"hippopotamus.ogg": "hroch",
"hit.ogg": "udrieť",
"hive.ogg": "úľ",
"hockey.ogg": "hokej",
"hole.ogg": "diera",
+ "home.ogg": "domov",
"hook.ogg": "háčik",
"hop.ogg": "hopsať",
"horse.ogg": "kôň",
"hose.ogg": "hadica",
"hospital.ogg": "nemocnica",
"hot.ogg": "horúci",
"hot_dog.ogg": "hotdog",
+ "hound.ogg": "Stavač",
"house.ogg": "dom",
"howl.ogg": "zavýjať",
+ "hug.ogg": "objímať",
"huge.ogg": "obrovský",
"hummingbird.ogg": "kolibrík",
+ "hunchbacked.ogg": "hrbatý",
"hunter.ogg": "lovec",
"husband.ogg": "manžel",
"hut.ogg": "chatrč",
"hyena.ogg": "hyena",
"ice.ogg": "ľad",
"iceberg.ogg": "ľadovec",
"iguana.ogg": "leguán",
"ill.ogg": "chorý",
"ink.ogg": "atrament",
"island.ogg": "ostrov",
"jacket.ogg": "sako",
"jaguar.ogg": "jaguár",
"jam.ogg": "lekvár",
"jay.ogg": "sojka",
"jelly.ogg": "želatína",
"jellyfish.ogg": "medúza",
"jewel.ogg": "šperk",
"job.ogg": "zamestnanie",
"jockey.ogg": "žokej",
"jog.ogg": "klusať",
+ "joy.ogg": "radosť",
"judge.ogg": "sudca",
"judo.ogg": "džudo",
"juggler.ogg": "žonglovať",
"juice.ogg": "džús",
"jump.ogg": "skákať",
"kangaroo.ogg": "kengura",
"keel.ogg": "prevrátiť",
"kernel.ogg": "kôstka",
"keyboard.ogg": "klávesnica",
"kimono.ogg": "kimono",
"king.ogg": "kráľ",
"kiss.ogg": "bozk",
"kitchen.ogg": "kuchyňa",
"kite.ogg": "šarkan",
"kitten.ogg": "mačiatko",
"kiwi.ogg": "kivi",
"knee.ogg": "koleno",
"kneel.ogg": "kľaknúť si",
"knife.ogg": "nôž",
"knight.ogg": "rytier",
"knit.ogg": "štrikovať",
"knot.ogg": "uzol",
"koala.ogg": "koala",
+ "lad.ogg": "chlapec",
"lady.ogg": "dáma",
"ladybug.ogg": "lienka",
"lake.ogg": "jazero",
"lama.ogg": "lama",
"lamb.ogg": "jahňa",
"lamp.ogg": "lampa",
"land.ogg": "krajina",
+ "lane.ogg": "chodník",
+ "lap.ogg": "kolo",
"lasso.ogg": "laso",
"laugh.ogg": "smiech",
"lava.ogg": "láva",
"lawn.ogg": "trávnik",
"lawyer.ogg": "advokát",
"leaf.ogg": "list",
"ledge.ogg": "výčnelok",
"leek.ogg": "pór",
"left.ogg": "vľavo",
"leg.ogg": "noha",
"lemon.ogg": "citrón",
"lemonade.ogg": "malinovka",
"lemur.ogg": "lemur",
"leopard.ogg": "leopard",
"lettuce.ogg": "šalát",
"librarian.ogg": "knihovníčka",
"lick.ogg": "olizovať",
"lid.ogg": "pokrievka",
"lift.ogg": "dvíhať",
"light.ogg": "svetlo",
"lighthouse.ogg": "maják",
"lightning.ogg": "blesky",
"lilac.ogg": "orgován",
"lime.ogg": "limeta",
"line.ogg": "čiarový kód",
"link.ogg": "spojenie",
"lion.ogg": "lev",
"lion_cub.ogg": "levíča",
"lip.ogg": "pery",
"liquid.ogg": "tekutý",
"lizard.ogg": "jašterica",
"lobster.ogg": "homár",
"log.ogg": "poleno",
"look.ogg": "vzhľad",
"lunch.ogg": "obed",
"mad.ogg": "šialený",
"magic.ogg": "kúzelník",
"magnet.ogg": "magnet",
"magnifying_glass.ogg": "lupa",
"magpie.ogg": "straka",
"mail.ogg": "obálka",
"man.ogg": "muž",
"mane.ogg": "hriva",
"mango.ogg": "mango",
"map.ogg": "mapa",
"maple.ogg": "javor",
"marble.ogg": "guľôčka",
"mashed_potatoes.ogg": "pyré",
"mask.ogg": "maska",
"mast.ogg": "sťažeň",
"mat.ogg": "rohožka",
"match.ogg": "zápalka",
+ "mate.ogg": "kamarát",
"mattress.ogg": "matrac",
"mauve.ogg": "fialová",
"meal.ogg": "jedlo",
"meat.ogg": "mäso",
"mechanic.ogg": "mechanik",
"medal.ogg": "medaila",
"meet.ogg": "stretnúť sa",
"melon.ogg": "melón",
"merry-go-round.ogg": "kolotoč",
+ "mice.ogg": "Myši",
"microphone.ogg": "myši",
"milk.ogg": "mlieko",
"mill.ogg": "mlyn",
"mimosa.ogg": "mimóza",
"mirror.ogg": "zrkadlo",
"mixer.ogg": "mixér",
"mole.ogg": "krtko",
"mom.ogg": "mamička",
"moon.ogg": "mesiac",
"moose.ogg": "sob",
"mop.ogg": "mop",
"mosque.ogg": "mešita",
"mosquito.ogg": "komár",
"mother.ogg": "matka",
"motorcycle.ogg": "motorka",
"mountain.ogg": "hora",
"mouse.ogg": "myš",
"mouth.ogg": "ústa",
"movie.ogg": "film",
"mower.ogg": "kosačka",
"mud.ogg": "blato",
"mug.ogg": "šálka",
"mule.ogg": "oslík",
"muscle.ogg": "sval",
"mushroom.ogg": "huba",
"music.ogg": "hudba",
"musician.ogg": "muzikant",
"naked.ogg": "nahý",
"nap.ogg": "odpočinok",
"navel.ogg": "pupok",
"neck.ogg": "krk",
"necklace.ogg": "náhrdelník",
"needle.ogg": "ihla",
"nest.ogg": "hniezdo",
"net.ogg": "sieť",
"newspaper.ogg": "noviny",
"night.ogg": "noc",
"nightgown.ogg": "nočná košeľa",
"nose.ogg": "nos",
"nostril.ogg": "nosná dierka",
"notebook.ogg": "zápisník",
"number.ogg": "číslo",
"nun.ogg": "mníška",
"nurse.ogg": "zdravotná sestra",
"nurse_male.ogg": "zdravotník",
"nut.ogg": "orech",
"oar.ogg": "veslo",
"ocean.ogg": "oceán",
"office.ogg": "kancelária",
"olive.ogg": "oliva",
"on.ogg": "na",
"onion.ogg": "cibuľa",
"open.ogg": "otvoriť",
"opossum.ogg": "vačica",
"orange-color.ogg": "oranžová",
"orange.ogg": "pomaranč",
"orchid.ogg": "orchidea",
"ostrich.ogg": "pštros",
"otter.ogg": "vydra",
"owl.ogg": "sova",
"ox.ogg": "vôl",
"oyster.ogg": "ustrica",
"pacifier.ogg": "cumlík",
"page.ogg": "strana",
"pair.ogg": "pár",
"pajamas.ogg": "pyžamo",
+ "pal.ogg": "kamoš",
"palm_tree.ogg": "palma",
"pan.ogg": "panvica",
"panda.ogg": "panda",
"panther.ogg": "panter",
"panties.ogg": "nohavičky",
"pants.ogg": "nohavice",
"papaya.ogg": "papája",
"paper.ogg": "papier",
"parachute.ogg": "padák",
"parakeet.ogg": "papagáj",
"parrot.ogg": "papagáj",
"patch.ogg": "záplata",
"path.ogg": "cestička",
"paw.ogg": "labka",
"pea.ogg": "hrášok",
"peach.ogg": "broskyňa",
"peacock.ogg": "páv",
"peak.ogg": "vrchol",
"pear.ogg": "hruška",
"pearl.ogg": "perla",
"peck.ogg": "zobať",
"pedal.ogg": "pedál",
"pelican.ogg": "pelikán",
"pen.ogg": "pero",
"pencil.ogg": "ceruzka",
"peony.ogg": "pivonka",
"people.ogg": "ľudia",
"pepper.ogg": "korenie",
"peppers.ogg": "papričky",
+ "pet.ogg": "domáce zviera",
"petal.ogg": "lupienok",
"phone.ogg": "telefón",
"piano.ogg": "klavír",
"picture.ogg": "obrázok",
"pie.ogg": "koláč",
"pig.ogg": "prasa",
"pigeon.ogg": "holub",
"pill.ogg": "pilulka",
"pillow.ogg": "vankúš",
"pilot.ogg": "pilot",
"pine.ogg": "borovica",
"pine_cone.ogg": "borovicová šuška",
"pink.ogg": "ružová",
"pip.ogg": "jadierko",
"pipe.ogg": "fajka",
"piranha.ogg": "piraňa",
"pirate.ogg": "pirát",
"pizza.ogg": "pizza",
"plane.ogg": "lietadlo",
"planet.ogg": "planéta",
"plant.ogg": "rastlina",
"plate.ogg": "tanier",
"play.ogg": "hrať sa",
"pliers.ogg": "kliešte",
"plow.ogg": "pluh",
"plum.ogg": "slivka",
"plumber.ogg": "inštalatér",
"pocket.ogg": "vrecko",
"pod.ogg": "struk",
"pole.ogg": "stĺpik",
"police.ogg": "policajt",
"pompon.ogg": "bambuľa",
"pond.ogg": "rybník",
"pony.ogg": "poník",
"pool.ogg": "kúpalisko",
"popcorn.ogg": "popkorn",
"pope.ogg": "pápež",
"porthole.ogg": "okienko",
"post.ogg": "poštová schránka",
"pot.ogg": "hrniec",
"potato.ogg": "zemiak",
"pounce.ogg": "vrhnúť sa",
"president.ogg": "prezident",
"pretty.ogg": "krása",
"price.ogg": "cena",
"priest.ogg": "kňaz",
"prince.ogg": "princ",
"princess.ogg": "princezná",
"prison.ogg": "väzenie",
"prisoner.ogg": "väzeň",
"prize.ogg": "trofej",
"pug.ogg": "buldog",
"pull.ogg": "ťahať",
"pullover.ogg": "pulóver",
"pumpkin.ogg": "tekvica",
"puppy.ogg": "šteniatko",
"pyramid.ogg": "pyramída",
"quarrel.ogg": "hádať sa",
"queen.ogg": "kráľovná",
"question.ogg": "otázka",
"quilt.ogg": "paplón",
"quiz.ogg": "kvíz",
"rabbit.ogg": "zajac",
"rabbit_baby.ogg": "zajačik",
"race.ogg": "preteky",
"radio.ogg": "rádio",
"radish.ogg": "reďkovka",
"raft.ogg": "plť",
"rag.ogg": "handra",
"rage.ogg": "zúrivosť",
"rain.ogg": "dážď",
"raincoat.ogg": "pršiplášť",
"rake.ogg": "hrable",
"ramp.ogg": "rampa",
+ "ran.ogg": "bežal",
"raspberry.ogg": "malina",
"rat.ogg": "potkan",
"razor.ogg": "holiaci strojček",
"read.ogg": "čítať",
"red.ogg": "červená",
"reptile.ogg": "plaz",
"rhinoceros.ogg": "had",
"rice.ogg": "ryža",
+ "ride.ogg": "jazda",
"rifle.ogg": "puška",
"right.ogg": "vpravo",
+ "rip.ogg": "trhať",
"rise.ogg": "stúpať",
"river.ogg": "rieka",
"road.ogg": "cesta",
"roast.ogg": "pečienka",
+ "robe.ogg": "župan",
"robot.ogg": "robot",
"rock.ogg": "skala",
"rocket.ogg": "raketa",
"rolling_pin.ogg": "valček",
"roof.ogg": "strecha",
"room.ogg": "izba",
"root.ogg": "koreň",
"rope.ogg": "švihadlo",
"rose.ogg": "ruža",
"round.ogg": "kruh",
"rowing.ogg": "veslovať",
"royal.ogg": "kráľovský",
"rug.ogg": "koberček",
"run.ogg": "utekať",
"sad.ogg": "smutný",
"saddle.ogg": "sedlo",
"sail.ogg": "plaviť sa",
"sailor.ogg": "námorník",
"salamander.ogg": "mlok",
"salmon.ogg": "losos",
"sand.ogg": "piesok",
"sandals.ogg": "sandále",
"sandwich.ogg": "sendvič",
"sash.ogg": "šerpa",
"sauce.ogg": "omáčka",
"sausage.ogg": "párok",
"scale.ogg": "váha",
"scar.ogg": "jazva",
"scare.ogg": "vystrašený",
"scarf.ogg": "šatka",
"school.ogg": "škola",
"school_bag.ogg": "aktovka",
"science.ogg": "veda",
"scissors.ogg": "nožnice",
"scorpion.ogg": "škorpión",
"scratch.ogg": "škriabať",
"scream.ogg": "kričať",
"screw.ogg": "skrutka",
"screwdriver.ogg": "skrutkovač",
"scribble.ogg": "čmárať",
"sea.ogg": "more",
"seat.ogg": "sedačka",
"see.ogg": "vidieť",
"seed.ogg": "semeno",
"shadow.ogg": "sedem",
"shake.ogg": "triasť",
"shark.ogg": "žralok",
"shave.ogg": "holiť sa",
"shed.ogg": "dielňa",
"sheep.ogg": "ovca",
"shelf.ogg": "polička",
"shell.ogg": "mušľa",
"ship.ogg": "loď",
"shirt.ogg": "košeľa",
"shoe.ogg": "topánka",
"shoelace.ogg": "šnúrka",
"shop.ogg": "obchod",
"shore.ogg": "breh",
"short.ogg": "šortky",
"shovel.ogg": "lopatka",
"shower.ogg": "sprcha",
"shrimp.ogg": "kreveta",
"shrub.ogg": "kríček",
"shut.ogg": "zatvoriť",
"shutter.ogg": "okenice",
"sick.ogg": "chorý",
"sidewalk.ogg": "chodník",
"sign.ogg": "značka",
"sing.ogg": "spievať",
"sink.ogg": "umývadlo",
"sip.ogg": "sŕkať",
"sister.ogg": "sestra",
"sit.ogg": "sedieť",
"skate.ogg": "jazdiť na skateboarde",
"skeleton.ogg": "kostra",
"ski.ogg": "lyžovať",
"skimmer.ogg": "zberačka",
"skin.ogg": "pokožka",
"skirt.ogg": "sukňa",
"skunk.ogg": "tchor",
"sky.ogg": "nebo",
"slam.ogg": "smeč",
"sled.ogg": "sánky",
"sleep.ogg": "spať",
"sleeve.ogg": "rukáv",
"sleigh.ogg": "sane",
"slide.ogg": "šmýkačka",
"slim.ogg": "tenký",
"slime.ogg": "sliz",
"slippers.ogg": "papuče",
"slope.ogg": "svah",
"sloppy.ogg": "poliaty",
"slot.ogg": "štrbina",
"sloth.ogg": "leňochod",
"slug.ogg": "slimák",
"small.ogg": "malý",
"smell.ogg": "voňať",
"smile.ogg": "usmievať sa",
"smock.ogg": "plášť",
"smoke.ogg": "fajčiť",
"smooch.ogg": "bozkávať",
+ "snack.ogg": "občerstvenie",
"snail.ogg": "slimák",
"snake.ogg": "had",
"sneaker.ogg": "teniska",
"sniff.ogg": "oňuchávať",
"snow.ogg": "sneh",
"soap.ogg": "mydlo",
"sob.ogg": "nariekať",
"sock.ogg": "ponožka",
"soldier.ogg": "vojak",
"sole.ogg": "platesa",
"sole_shoe.ogg": "vložky do topánok",
"son.ogg": "syn",
"soup.ogg": "polievka",
"spade.ogg": "rýľ",
"spaghetti.ogg": "špagety",
"spark.ogg": "iskra",
"sparrow.ogg": "vrabec",
"spatula.ogg": "stierka",
"speak.ogg": "rozprávať",
"spear.ogg": "oštep",
"spice.ogg": "korenie",
"spider.ogg": "pavúk",
"spider_web.ogg": "pavúčia sieť",
"spike.ogg": "pichľavý",
"spill.ogg": "rozliať",
"spinach.ogg": "špenát",
"spine.ogg": "chrbtica",
"spinning_top.ogg": "vĺčik",
"splash.ogg": "špliechať",
"splatter.ogg": "machuľa",
"sponge.ogg": "špongia",
"spool.ogg": "špuľka",
"spoon.ogg": "lyžica",
"sport.ogg": "šport",
"spot.ogg": "škvrna",
"spray.ogg": "sprejovať",
"spread.ogg": "nátierka",
"spring.ogg": "pružina",
"spring_season.ogg": "jar",
+ "sprinkle.ogg": "posýpka",
"square.ogg": "štvorec",
"squash.ogg": "tlačiť sa",
"squat.ogg": "drep",
"squid.ogg": "chobotnica",
"squirrel.ogg": "veverička",
+ "squirt.ogg": "striekačka",
"stack.ogg": "kopa",
"stage.ogg": "javisko",
"staircase.ogg": "schodisko",
"stamp.ogg": "známka",
"stand.ogg": "stáť",
"star.ogg": "hviezda",
"stare.ogg": "zazerať",
"starfish.ogg": "hviezdica",
"steam.ogg": "para",
"steep.ogg": "strmý",
"steeple.ogg": "vežička",
"stem.ogg": "stonka",
"step.ogg": "schod",
"stew.ogg": "vývar",
"stick.ogg": "palička",
"sting.ogg": "žihadlo",
"stinky.ogg": "smradľavý",
"stitch.ogg": "steh",
"stomach.ogg": "žalúdok",
"stone.ogg": "kameň",
"stop.ogg": "zastaviť",
"store.ogg": "obchod",
"stove.ogg": "sporák",
"straight.ogg": "rovný",
"strainer.ogg": "sitko",
"straw.ogg": "slamka",
"strawberry.ogg": "jahoda",
"stream.ogg": "tok",
"street.ogg": "ulica",
"stretch.ogg": "natiahnuť sa",
"string.ogg": "špagát",
"stripe.ogg": "pásik",
"strong.ogg": "silný",
"student.ogg": "študent",
"study.ogg": "učiť sa",
"stump.ogg": "peň",
"sugar.ogg": "cukor",
"suit.ogg": "oblek",
"suitcase.ogg": "kufor",
"summer.ogg": "leto",
"summit.ogg": "výstup",
"sun.ogg": "slnko",
"swan.ogg": "labuť",
"sweat.ogg": "potiť sa",
"sweatshirt.ogg": "mikina",
"swim.ogg": "plávať",
"table.ogg": "stôl",
"tablecloth.ogg": "obrus",
"tadpole.ogg": "žubrienka",
"tag.ogg": "štítok",
"tail.ogg": "chvost",
"tall.ogg": "chvost",
"tape_measure.ogg": "meracie pásmo",
"taxi.ogg": "taxík",
"teach.ogg": "učiť",
"teacher.ogg": "učiteľ",
"tear.ogg": "trhať",
"teddy.ogg": "macík",
"teeth.ogg": "zuby",
"television.ogg": "televízia",
"temple.ogg": "chrám",
"tennis.ogg": "tenis",
"tent.ogg": "stan",
"text.ogg": "text",
"thick.ogg": "hrubý",
"thief.ogg": "zlodej",
"thigh.ogg": "stehno",
"think.ogg": "premýšľať",
"thread.ogg": "niť",
"throat.ogg": "hrdlo",
"throw.ogg": "hodiť",
"thumb.ogg": "palec",
+ "tick.ogg": "tik",
"ticket.ogg": "vstupenka",
"tiger.ogg": "tiger",
"time.ogg": "čas",
"tin.ogg": "konzerva",
"tire.ogg": "pneumatika",
"tired.ogg": "unavený",
"tissue.ogg": "vreckovka",
"to_drink.ogg": "piť",
"toad.ogg": "ropucha",
"toaster.ogg": "hriankovač",
"toe.ogg": "palec",
"toilet.ogg": "záchod",
"tomatoe.ogg": "rajčina",
"tongs.ogg": "kliešte",
"tongue.ogg": "jazyk",
"tool.ogg": "nástroj",
"top.ogg": "vrch",
"torch.ogg": "fakľa",
"touch.ogg": "dotknúť sa",
"towel.ogg": "uterák",
"toy.ogg": "hračka",
"trail.ogg": "turistický chodník",
"train.ogg": "vlak",
"train_station.ogg": "vlaková stanica",
"trap.ogg": "pasca",
"trash.ogg": "odpadky",
"tray.ogg": "tácka",
"treat.ogg": "bonbóny",
"tree.ogg": "strom",
"triangle.ogg": "trojuholník",
"tribe.ogg": "kmeň",
"trip.ogg": "výlet",
"truck.ogg": "nákladiak",
"tube.ogg": "rúž",
"tulip.ogg": "tulipán",
"tune.ogg": "melódia",
"turkey.ogg": "moriak",
"turnip.ogg": "repa",
"turtle.ogg": "korytnačka",
"tusk.ogg": "kel",
"twin_boys.ogg": "dvojičky",
"twin_girls.ogg": "dvojičky",
"umbrella.ogg": "dáždnik",
"under.ogg": "pod",
"uniform.ogg": "uniforma",
"van.ogg": "dodávka",
+ "vapor.ogg": "para",
"vase.ogg": "váza",
"vegetable.ogg": "zelenina",
"vein.ogg": "žily",
"verdure.ogg": "zeleň",
"vest.ogg": "vesta",
"vet.ogg": "veterinár",
"viper.ogg": "zmija",
"vowel.ogg": "samohláska",
"vulture.ogg": "sup",
"wag.ogg": "vrtieť",
"walk.ogg": "vykračovať si",
"wall.ogg": "stena",
"walnut.ogg": "vlašský orech",
"wart.ogg": "bradavica",
+ "wash.ogg": "umývať",
"wasp.ogg": "osa",
"watch.ogg": "hodinky",
"water.ogg": "voda",
"wave.ogg": "vlna",
"wedding.ogg": "svadba",
"wedge.ogg": "klin",
"weight.ogg": "činky",
"wet.ogg": "mokrý",
"whale.ogg": "veľryba",
"wheat.ogg": "pšenica",
"wheel.ogg": "koleso",
"whisk.ogg": "metlička",
"whisper.ogg": "šepkať",
"white.ogg": "biela",
"wide.ogg": "široký",
+ "wife.ogg": "žena",
"wig.ogg": "parochňa",
"win.ogg": "vyhrať",
"wind.ogg": "vietor",
"window.ogg": "okno",
"window_glass.ogg": "okenné sklo",
"wing.ogg": "krídlo",
"winter.ogg": "zima",
"wolf.ogg": "vlk",
"woman.ogg": "žena",
"wood.ogg": "drevo",
"word.ogg": "slovo",
"worker.ogg": "robotník",
"world.ogg": "svet",
"wreath.ogg": "veniec",
"wrench.ogg": "francúzsky kľúč",
"wrist.ogg": "zápästie",
"write.ogg": "písať",
"yellow.ogg": "žltý",
"yogurt.ogg": "jogurt",
"yum.ogg": "maškrtiť",
"zebra.ogg": "zebra",
"zipper.ogg": "zips",
"zoo.ogg": "zoologická záhrada"
}
diff --git a/src/activities/letter-in-word/letter-in-word.js b/src/activities/letter-in-word/letter-in-word.js
index 05f6e2e11..e433c02d1 100644
--- a/src/activities/letter-in-word/letter-in-word.js
+++ b/src/activities/letter-in-word/letter-in-word.js
@@ -1,237 +1,237 @@
/* GCompris - letter-in-word.js
*
* Copyright (C) 2014 Holger Kaelberer
* 2016 Akshat Tandon
*
* Authors:
* Holger Kaelberer <holger.k@elberer.de> (Qt Quick port of click-on-letter)
* Akshat Tandon <akshat.tandon@research.iiit.ac.in>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris //for ApplicationInfo
.import "qrc:/gcompris/src/core/core.js" as Core
.import "qrc:/gcompris/src/activities/lang/lang_api.js" as Lang
var url = "qrc:/gcompris/src/activities/letter-in-word/resource/"
var resUrl = "qrc:/gcompris/src/activities/braille_fun/resource/"
var resUrl2 = "qrc:/gcompris/src/activities/click_on_letter/resource/"
var levels;
var currentLevel;
var maxLevel;
var currentSubLevel;
var currentLetter;
var maxSubLevel;
var questions;
var words;
var items;
var dataset = null;
var frequency;
var incorrectFlag = false;
var locale;
function start(_items) {
Core.checkForVoices(_items.main);
items = _items;
// register the voices for the locale
locale = GCompris.ApplicationInfo.getVoicesLocale(items.locale)
GCompris.DownloadManager.updateResource(GCompris.DownloadManager.getVoicesResourceForLocale(locale))
loadDataset();
levels = Lang.getAllLessons(dataset)
currentLevel = 0;
currentSubLevel = 0;
maxLevel = levels.length;
initLevel();
}
function loadDataset() {
var resourceUrl = "qrc:/gcompris/src/activities/lang/resource/"
var data = Lang.loadDataset(items.parser, resourceUrl, locale);
dataset = data["dataset"];
items.background.englishFallback = data["englishFallback"];
}
function stop() {
items.animateX.stop()
}
function shuffleString(s) {
var a = s;
var n = a.length;
for(var i = n-1; i > 0; --i) {
var j = Math.floor(Math.random() * (i + 1));
var tmp = a[i];
a[i] = a[j];
a[j] = tmp;
}
return a.join("");
}
function initLevel() {
items.bar.level = currentLevel + 1;
if (currentSubLevel == 0 && !incorrectFlag) {
var level = levels[currentLevel];
words = Lang.getLessonWords(dataset, level);
Core.shuffle(words);
var limit = Math.min(items.currentMode, words.length);
words = words.slice(0, limit);
frequency = calculateFrequency();
var tempQuestions = generateQuestions();
maxSubLevel = tempQuestions.length;
items.score.numberOfSubLevels = maxSubLevel;
items.score.currentSubLevel = 1;
questions = shuffleString(tempQuestions);
items.wordsModel.clear();
for (var i = 0; i < words.length; i++) {
items.wordsModel.append({
"spelling": words[i].translatedTxt,
"imgurl": words[i].image,
"selected": false,
"voice": words[i].voice
});
}
}
else {
items.score.currentSubLevel = currentSubLevel + 1;
}
incorrectFlag = false;
for(var i = 0; i < words.length; i++) {
items.wordsModel.setProperty(i, "selected", false);
}
currentLetter = questions[currentSubLevel];
items.question = currentLetter;
items.animateX.restart();
if(items.currentLetterCase == Quick.Font.MixedCase) {
items.questionItem.font.capitalization = (Math.floor(Math.random() * 2) < 1) ? Quick.Font.AllLowercase : Quick.Font.AllUppercase
}
else {
items.questionItem.font.capitalization = items.currentLetterCase
}
if (GCompris.ApplicationSettings.isAudioVoicesEnabled &&
GCompris.DownloadManager.haveLocalResource(
GCompris.DownloadManager.getVoicesResourceForLocale(locale))) {
items.audioVoices.silence(100)
playLetter(currentLetter)
}
}
function calculateFrequency() {
var freq = [];
//regex pattern to detect whether the character is an english alphabet or some accented latin character
var pattern = /[A-Za-z\u00C0-\u017F]/;
for(var i = 0; i < words.length; i++) {
var currentWord = words[i].translatedTxt;
for(var j = 0; j < currentWord.length; j++) {
var character = currentWord.charAt(j);
//consider the character if and only if it is an alphabet or an accented latin character
if(pattern.test(character)) {
if(freq[character]) {
freq[character]++;
}
else {
freq[character] = 1;
}
}
}
}
return freq;
}
function generateQuestions() {
var freqArr = [];
var ques = [];
for(var character in frequency) {
freqArr.push([character, frequency[character]]);
}
freqArr.sort(function(a, b) {return b[1] - a[1]});
var limit = Math.min(10, freqArr.length);
for(var i = 0; i < limit; i++) {
ques.push(freqArr[i][0])
}
return ques;
}
function playLetter(letter) {
items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/"+locale+"/alphabet/"
+ Core.getSoundFilenamForChar(letter)))
}
function nextLevel() {
items.audioVoices.clearQueue()
if(maxLevel <= ++currentLevel) {
currentLevel = 0
}
currentSubLevel = 0;
initLevel();
}
function previousLevel() {
items.audioVoices.clearQueue()
if(--currentLevel < 0) {
currentLevel = maxLevel - 1
}
currentSubLevel = 0;
initLevel();
}
function nextSubLevel() {
if( ++currentSubLevel >= maxSubLevel) {
currentSubLevel = 0
nextLevel()
}
initLevel();
}
function checkAnswer() {
var allCorrectSelected = true
var modelEntry;
var letterIndex;
for(var i = 0; i < words.length; i++) {
modelEntry = items.wordsModel.get(i);
letterIndex = modelEntry.spelling.indexOf(currentLetter);
if(letterIndex != -1 && modelEntry.selected == false) {
allCorrectSelected = false;
break;
}
if(letterIndex == -1 && modelEntry.selected == true) {
allCorrectSelected = false;
break;
}
}
if(allCorrectSelected == true) {
items.bonus.good("flower");
}
else {
- items.bonus.bad("flower");
+ items.bonus.bad("flower", items.bonus.checkAnswer);
}
}
function checkWord(index) {
var modelEntry = items.wordsModel.get(index);
items.wordsModel.setProperty(index, "selected", !modelEntry.selected);
return modelEntry.selected;
}
diff --git a/src/activities/lightsoff/ActivityInfo.qml b/src/activities/lightsoff/ActivityInfo.qml
index 15a701018..4e19e9b9f 100644
--- a/src/activities/lightsoff/ActivityInfo.qml
+++ b/src/activities/lightsoff/ActivityInfo.qml
@@ -1,40 +1,40 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Stephane Mankowski <stephane@mankowski.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "lightsoff/Lightsoff.qml"
difficulty: 6
icon: "lightsoff/lightsoff.svg"
author: "Stephane Mankowski &lt;stephane@mankowski.fr&gt;"
demo: true
//: Activity title
title: qsTr("Lights Off")
//: Help title
description: qsTr("The aim is to switch off all the lights.")
// intro: "Click on the lamps to turn them off."
//: Help goal
goal: qsTr("The aim is to switch off all the lights.")
//: Help prerequisite
prerequisite: ""
//: Help manual
- manual: qsTr("The effect of pressing a button is to toggle the state of that button, and of its immediate vertical and horizontal neighbors. The sun and the color of the sky depend on the number of clicks needed to solve the puzzle. If you click on Tux, the solution is shown.")
- credit: qsTr("The solver algorithm is described on Wikipedia. To know more about the Lights Off game: &lt;http://en.wikipedia.org/wiki/Lights_Out_(game)&gt;")
+ manual: qsTr("The effect of pressing a window is to toggle the state of that window, and of its immediate vertical and horizontal neighbors. The sun and the color of the sky depend on the number of clicks needed to solve the puzzle. If you click on Tux, the solution is shown.")
+ credit: qsTr("The solver algorithm is described on Wikipedia. To know more about the Lights Off game: &lt;https://en.wikipedia.org/wiki/Lights_Out_(game)&gt;")
section: "discovery logic"
createdInVersion: 0
}
diff --git a/src/activities/louis-braille/ActivityInfo.qml b/src/activities/louis-braille/ActivityInfo.qml
index 0e4c29d19..d3bfd0aa6 100644
--- a/src/activities/louis-braille/ActivityInfo.qml
+++ b/src/activities/louis-braille/ActivityInfo.qml
@@ -1,40 +1,40 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Arkit Vora <arkitvora123@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "louis-braille/LouisBraille.qml"
difficulty: 4
icon: "louis-braille/louis-braille.svg"
author: "Arkit Vora &lt;arkitvora123@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("The History of Louis Braille")
//: Help title
description: qsTr("Review the major dates of the inventor of the Braille System")
//intro: "Discover the history of Louis Braille."
//: Help goal
goal: ""
//: Help prerequisite
prerequisite: ""
//: Help manual
manual: qsTr("Read the history of Louis Braille, his biography, and the invention of the Braille system. Click on the previous and next buttons to move between the story pages. At the end, arrange the sequence in chronological order.")
- credit: qsTr("Louis Braille Video: &lt;http:\/\/www.youtube.com/watch?v=9bdfC2j_4x4&gt;")
+ credit: qsTr("Louis Braille Video: &lt;https:\/\/www.youtube.com/watch?v=9bdfC2j_4x4&gt;")
section: "sciences history"
createdInVersion: 4000
}
diff --git a/src/activities/melody/Melody.qml b/src/activities/melody/Melody.qml
index af54b43d3..69fdf9609 100644
--- a/src/activities/melody/Melody.qml
+++ b/src/activities/melody/Melody.qml
@@ -1,254 +1,269 @@
/* GCompris - melody.qml
*
* Copyright (C) 2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Jose JORGE <jjorge@free.fr> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
isMusicalActivity: true
pageComponent: Image {
id: background
anchors.fill: parent
source: items.url + 'xylofon_background.svg'
sourceSize.width: Math.max(parent.width, parent.height)
fillMode: Image.PreserveAspectCrop
signal start
signal stop
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property string url: "qrc:/gcompris/src/activities/melody/resource/"
property var question
property var questionToPlay
property var answer
property alias questionInterval: questionPlayer.interval
property int numberOfLevel: 10
property bool running: false
}
onStart: {
bar.level = 1
score.numberOfSubLevels = 5
score.currentSubLevel = 1
initLevel()
items.running = true
+ introDelay.start()
}
onStop: {
knock.stop()
questionPlayer.stop()
items.running = false
}
Image {
id: xylofon
anchors {
fill: parent
margins: 10 * ApplicationInfo.ratio
}
source: items.url + 'xylofon.svg'
sourceSize.width: parent.width * 0.7
fillMode: Image.PreserveAspectFit
}
Repeater {
id: parts
model: 4
Image {
id: part
source: items.url + 'xylofon_part' + (index + 1) + '.svg'
rotation: - 80
anchors.horizontalCenter: xylofon.horizontalCenter
anchors.horizontalCenterOffset: (- xylofon.paintedWidth) * 0.3 + xylofon.paintedWidth * index * 0.22
anchors.verticalCenter: xylofon.verticalCenter
anchors.verticalCenterOffset: - xylofon.paintedHeight * 0.1
sourceSize.width: xylofon.paintedWidth * 0.5
fillMode: Image.PreserveAspectFit
property alias anim: anim
SequentialAnimation {
id: anim
NumberAnimation {
target: part
property: "scale"
from: 1; to: 0.95
duration: 150
easing.type: Easing.InOutQuad
}
NumberAnimation {
target: part
property: "scale"
from: 0.95; to: 1
duration: 150
easing.type: Easing.OutElastic
}
}
MouseArea {
anchors.fill: parent
enabled: !questionPlayer.running
onClicked: {
anim.start()
background.playNote(index)
items.answer.push(index)
background.checkAnswer()
}
}
}
}
function playNote(index) {
activity.audioEffects.play(ApplicationInfo.getAudioFilePath(items.url +
'xylofon_son' + (index + 1) + ".wav"))
}
+ Timer {
+ id: introDelay
+ interval: 1000
+ repeat: false
+ onTriggered: {
+ if(activity.audioVoices.playbackState == 1) {
+ introDelay.start()
+ }
+ else {
+ parent.repeat()
+ }
+ }
+ }
+
Timer {
id: knock
interval: 1000
repeat: false
onTriggered: {
questionPlayer.start()
}
}
Timer {
id: questionPlayer
onTriggered: {
var partIndex = items.questionToPlay.shift()
if(partIndex !== undefined) {
parts.itemAt(partIndex).anim.start()
background.playNote(partIndex)
start()
}
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level | repeat }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: {
score.currentSubLevel = 1
if(bar.level == 1) {
bar.level = items.numberOfLevel
} else {
bar.level--
}
initLevel();
}
onNextLevelClicked: parent.nextLevel()
onHomeClicked: activity.home()
onRepeatClicked: parent.repeat()
}
Bonus {
id: bonus
onWin: {
parent.nextSubLevel()
parent.repeat()
}
onLoose: parent.repeat()
}
Score {
id: score
anchors.bottom: undefined
anchors.right: parent.right
anchors.rightMargin: 10 * ApplicationInfo.ratio
anchors.top: parent.top
}
function initLevel() {
items.question = []
questionPlayer.stop()
var numberOfParts = 4
if(bar.level < 3)
numberOfParts = 2
else if(bar.level < 5)
numberOfParts = 3
for(var i = 0; i < bar.level + 2; ++i) {
items.question.push(Math.floor(Math.random() * numberOfParts))
}
items.questionInterval = 1200 - Math.min(500, 100 * bar.level)
items.answer = []
}
function nextSubLevel() {
if(score.currentSubLevel < score.numberOfSubLevels) {
score.currentSubLevel++
initLevel()
return
}
nextLevel()
}
function nextLevel() {
score.currentSubLevel = 1
if(items.numberOfLevel === bar.level ) {
bar.level = 1
} else {
bar.level++
}
initLevel();
}
function repeat() {
if(items.running == true) {
questionPlayer.stop()
activity.audioEffects.play(ApplicationInfo.getAudioFilePath(items.url + 'knock.wav'))
items.questionToPlay = items.question.slice()
items.answer = []
knock.start()
}
}
function checkAnswer() {
if(items.answer.join() == items.question.join())
bonus.good('lion')
else if(items.answer.length >= items.question.length)
bonus.bad('lion')
}
}
}
diff --git a/src/activities/memory-sound-tux/MemorySoundTux.qml b/src/activities/memory-sound-tux/MemorySoundTux.qml
index 270395b1a..cbf765e56 100644
--- a/src/activities/memory-sound-tux/MemorySoundTux.qml
+++ b/src/activities/memory-sound-tux/MemorySoundTux.qml
@@ -1,31 +1,32 @@
/* gcompris - MemorySound.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "../memory"
import "../memory-sound/memorysounddataset.js" as Dataset
MemoryCommon {
dataset: Dataset.get()
backgroundImg: "qrc:/gcompris/src/activities/memory-sound/resource/gcompris_band.svg"
withTux: true
+ isMusicalActivity: true
}
diff --git a/src/activities/memory-sound/MemorySound.qml b/src/activities/memory-sound/MemorySound.qml
index f9601e825..e7215ce48 100644
--- a/src/activities/memory-sound/MemorySound.qml
+++ b/src/activities/memory-sound/MemorySound.qml
@@ -1,31 +1,32 @@
/* gcompris - MemorySound.qml
*
* Copyright (C) 2014 JB BUTET <ashashiwa@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* JB BUTET <ashashiwa@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../memory"
import "memorysounddataset.js" as Dataset
MemoryCommon {
dataset: Dataset.get()
backgroundImg: "qrc:/gcompris/src/activities/memory-sound/resource/gcompris_band.svg"
+ isMusicalActivity: true
}
diff --git a/src/activities/menu/BackgroundMusicList.qml b/src/activities/menu/BackgroundMusicList.qml
new file mode 100644
index 000000000..d09724294
--- /dev/null
+++ b/src/activities/menu/BackgroundMusicList.qml
@@ -0,0 +1,236 @@
+/* GCompris - BackgroundMusicList.qml
+ *
+ * Copyright (C) 2019 Aman Kumar Gupta <gupta2140@gmail.com>
+ *
+ * Authors:
+ * Aman Kumar Gupta <gupta2140@gmail.com> (Qt Quick)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.6
+import QtQuick.Controls 1.5
+import GCompris 1.0
+
+import "../../core"
+import "qrc:/gcompris/src/core/core.js" as Core
+
+Rectangle {
+ id: dialogBackground
+ color: "#696da3"
+ border.color: "black"
+ border.width: 1
+ z: 10000
+ anchors.fill: parent
+ visible: false
+
+ Keys.onEscapePressed: close()
+
+ signal close
+
+ property bool horizontalLayout: dialogBackground.width >= dialogBackground.height
+ property int margin30: Math.round(30 * ApplicationInfo.ratio)
+
+ Row {
+ spacing: 2
+ Item { width: 10; height: 1 }
+
+ Column {
+ spacing: 10
+ anchors.top: parent.top
+ Item { width: 1; height: 10 }
+ Rectangle {
+ id: titleRectangle
+ color: "#e6e6e6"
+ radius: 6.0
+ width: dialogBackground.width - 30
+ height: title.height * 1.2
+ border.color: "black"
+ border.width: 2
+
+ GCText {
+ id: title
+ text: qsTr("Background music")
+ width: dialogBackground.width - 30
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ color: "black"
+ fontSize: 20
+ font.weight: Font.DemiBold
+ wrapMode: Text.WordWrap
+ }
+ }
+
+ Rectangle {
+ color: "#e6e6e6"
+ radius: 6.0
+ width: dialogBackground.width - 30
+ height: dialogBackground.height - 100
+ border.color: "black"
+ border.width: 2
+ anchors.margins: 100
+
+ Flickable {
+ id: flickableList
+ anchors.fill: parent
+ anchors.margins: 10 * ApplicationInfo.ratio
+ contentHeight: musicGrid.height + musicInfo.height + margin30
+ flickableDirection: Flickable.VerticalFlick
+ clip: true
+
+ Flow {
+ id: musicGrid
+ width: parent.width
+ spacing: 10 * ApplicationInfo.ratio
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ Repeater {
+ model: dialogActivityConfig.configItem ? dialogActivityConfig.configItem.allBackgroundMusic : 0
+
+ Item {
+ width: (musicGrid.width - margin30) * 0.33
+ height: title.height * 2
+
+ Button {
+ text: modelData.slice(0, modelData.lastIndexOf('.'))
+ onClicked: {
+ if(dialogActivityConfig.configItem.filteredBackgroundMusic.indexOf(modelData) == -1) {
+ // Keep the filtered playlist sorted w.r.t to their positions in "allBackgroundMusic" to maintain their playing order
+ var musicOriginalPosition = dialogActivityConfig.configItem.allBackgroundMusic.indexOf(modelData)
+ var i = 0
+ while(i < dialogActivityConfig.configItem.filteredBackgroundMusic.length) {
+ var filteredMusicName = dialogActivityConfig.configItem.filteredBackgroundMusic[i]
+ if(dialogActivityConfig.configItem.allBackgroundMusic.indexOf(filteredMusicName) > musicOriginalPosition)
+ break
+ i++
+ }
+ dialogActivityConfig.configItem.filteredBackgroundMusic.splice(i, 0, modelData)
+ }
+ else {
+ dialogActivityConfig.configItem.filteredBackgroundMusic.splice(dialogActivityConfig.configItem.filteredBackgroundMusic.indexOf(modelData), 1)
+ if(dialogActivityConfig.configItem.filteredBackgroundMusic == 0) {
+ dialogActivityConfig.configItem.filteredBackgroundMusic.push(modelData)
+ selectedIcon.visible = false
+ Core.showMessageDialog(dialogBackground,
+ qsTr("Disable the background music if you don't want to play them."),
+ "", null,
+ "", null,
+ null
+ );
+ }
+ }
+
+ selectedIcon.visible = !selectedIcon.visible
+ }
+ width: parent.width
+ height: parent.height * 0.8
+ style: GCButtonStyle {
+ theme: "dark"
+ }
+
+ Image {
+ id: selectedIcon
+ source: "qrc:/gcompris/src/core/resource/apply.svg"
+ sourceSize.width: height
+ sourceSize.height: height
+ width: height
+ height: parent.height / 4
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ anchors.margins: 2
+ visible: dialogActivityConfig.configItem.filteredBackgroundMusic ? dialogActivityConfig.configItem.filteredBackgroundMusic.indexOf(modelData) != -1 : false
+ }
+ }
+ }
+ }
+ }
+
+ Column {
+ id: musicInfo
+ spacing: 10 * ApplicationInfo.ratio
+ width: parent.width
+ anchors.top: musicGrid.bottom
+ anchors.leftMargin: 20
+
+ GCText {
+ //: Current background music playing
+ text: qsTr("Now Playing:")
+ width: dialogBackground.width - 30
+ horizontalAlignment: Text.AlignHCenter
+ color: "black"
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ GCText {
+ //: Title of the current background music playing
+ text: qsTr("Title: %1").arg(backgroundMusic.metaDataMusic[0])
+ width: dialogBackground.width - 30
+ horizontalAlignment: Text.AlignLeft
+ color: "black"
+ fontSize: smallSize
+ wrapMode: Text.WordWrap
+ }
+ GCText {
+ //: Artist of the current background music playing
+ text: qsTr("Artist: %1").arg(backgroundMusic.metaDataMusic[1])
+ width: dialogBackground.width - 30
+ horizontalAlignment: Text.AlignLeft
+ color: "black"
+ fontSize: smallSize
+ wrapMode: Text.WordWrap
+ }
+ GCText {
+ //: Year of the current background music playing
+ text: qsTr("Year: %1").arg(backgroundMusic.metaDataMusic[2])
+ width: dialogBackground.width - 30
+ horizontalAlignment: Text.AlignLeft
+ color: "black"
+ fontSize: smallSize
+ wrapMode: Text.WordWrap
+ }
+ GCText {
+ //: Copyright of the current background music playing
+ text: qsTr("Copyright: %1").arg(backgroundMusic.metaDataMusic[3])
+ width: dialogBackground.width - 30
+ horizontalAlignment: Text.AlignLeft
+ color: "black"
+ fontSize: smallSize
+ wrapMode: Text.WordWrap
+ }
+ }
+ }
+ // The scroll buttons
+ GCButtonScroll {
+ anchors.right: parent.right
+ anchors.rightMargin: 5 * ApplicationInfo.ratio
+ anchors.bottom: flickableList.bottom
+ anchors.bottomMargin: 30 * ApplicationInfo.ratio
+ width: parent.width / 20
+ height: width * heightRatio
+ onUp: flickableList.flick(0, 1400)
+ onDown: flickableList.flick(0, -1400)
+ upVisible: (flickableList.visibleArea.yPosition <= 0) ? false : true
+ downVisible: ((flickableList.visibleArea.yPosition + flickableList.visibleArea.heightRatio) >= 1) ? false : true
+ }
+ }
+ Item { width: 1; height: 10 }
+ }
+ }
+
+ GCButtonCancel {
+ onClose: {
+ parent.close()
+ }
+ }
+}
diff --git a/src/activities/menu/ConfigurationItem.qml b/src/activities/menu/ConfigurationItem.qml
index 758c3a4be..57fbfe278 100644
--- a/src/activities/menu/ConfigurationItem.qml
+++ b/src/activities/menu/ConfigurationItem.qml
@@ -1,731 +1,884 @@
/* GCompris - ConfigurationItem.qml
*
* Copyright (C) 2014-2016 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.5
import QtQuick.Controls.Styles 1.4
import GCompris 1.0
+import QtMultimedia 5.0
import "../../core"
import "qrc:/gcompris/src/core/core.js" as Core
Item {
id: dialogConfig
property var languages: allLangs.languages
height: column.height
LanguageList {
id: allLangs
}
Column {
id: column
- spacing: 10
+ spacing: 10 * ApplicationInfo.ratio
width: parent.width
move: Transition {
NumberAnimation { properties: "x,y"; duration: 120 }
}
// Put configuration here
Row {
id: demoModeBox
width: parent.width
- spacing: 10
+ spacing: 10 * ApplicationInfo.ratio
property bool checked: !ApplicationSettings.isDemoMode
Image {
sourceSize.height: 50 * ApplicationInfo.ratio
source:
demoModeBox.checked ? "qrc:/gcompris/src/core/resource/apply.svg" :
"qrc:/gcompris/src/core/resource/cancel.svg"
MouseArea {
anchors.fill: parent
onClicked: {
if(ApplicationSettings.isDemoMode)
ApplicationSettings.isDemoMode = false
}
}
}
Button {
width: parent.parent.width - 50 * ApplicationInfo.ratio - 10 * 2
height: parent.height
enabled: ApplicationSettings.isDemoMode
anchors.leftMargin: 10
anchors.verticalCenter: parent.verticalCenter
text: demoModeBox.checked ? qsTr("You have the full version") :
qsTr("Buy the full version").toUpperCase()
style: ButtonStyle {
background: Rectangle {
implicitWidth: 100
implicitHeight: 25
border.width: control.activeFocus ? 4 : 2
border.color: "black"
radius: 10
gradient: Gradient {
GradientStop { position: 0 ; color: control.pressed ? "#87ff5c" :
ApplicationSettings.isDemoMode ? "#ffe85c" : "#EEEEEE"}
GradientStop { position: 1 ; color: control.pressed ? "#44ff00" :
ApplicationSettings.isDemoMode ? "#f8d600" : "#AAAAAA"}
}
}
label: GCText {
text: control.text
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
}
}
onClicked: {
if(ApplicationSettings.activationMode == 1) {
if(ApplicationSettings.isDemoMode)
ApplicationSettings.isDemoMode = false
} else if(ApplicationSettings.activationMode == 2) {
activationCodeEntry.visible = !activationCodeEntry.visible
}
}
}
}
Column {
id: activationCodeEntry
width: parent.width
spacing: 10
visible: false
opacity: 0
Behavior on opacity { NumberAnimation { duration: 200 } }
onVisibleChanged: {
if(visible) {
activationInput.forceActiveFocus()
activationInput.cursorPosition = 0
opacity = 1
} else {
activationInput.focus = false
opacity = 0
}
}
GCText {
id: activationInstruction
fontSize: regularSize
color: "black"
style: Text.Outline
styleColor: "white"
horizontalAlignment: Text.AlignHCenter
width: parent.width
wrapMode: TextEdit.WordWrap
text: qsTr("On <a href='https://gcompris.net'>https://gcompris.net</a> " +
"you will find the instructions to obtain an activation code.")
Component.onCompleted: ApplicationInfo.isDownloadAllowed ?
linkActivated.connect(Qt.openUrlExternally) : null
}
TextInput {
id: activationInput
width: parent.width
focus: true
font.weight: Font.DemiBold
font.pointSize: ApplicationSettings.baseFontSize
+ 14 * ApplicationInfo.fontRatio
color: 'black'
horizontalAlignment: Text.AlignHCenter
inputMask: '>HHHH-HHHH-HHHH;#'
text: ApplicationSettings.codeKey
onTextChanged: {
var code = text.replace(/-/g,'')
var codeValidity = ApplicationSettings.checkActivationCode(code);
switch (codeValidity) {
case 0:
activationMsg.text = qsTr('Enter your activation code');
break;
case 1:
activationMsg.text = qsTr('Sorry, your code is too old for this version of GCompris');
break;
case 2:
activationMsg.text = qsTr('Your code is valid, thanks a lot for your support');
activationCodeEntry.visible = false
ApplicationSettings.codeKey = code
break;
}
}
}
GCText {
id: activationMsg
width: parent.width
color: "black"
fontSize: regularSize
horizontalAlignment: TextInput.AlignHCenter
wrapMode: TextEdit.WordWrap
}
}
GCDialogCheckBox {
id: displayLockedActivitiesBox
text: qsTr("Show locked activities")
visible: ApplicationSettings.isDemoMode
checked: showLockedActivities
onCheckedChanged: {
showLockedActivities = checked;
}
}
GCDialogCheckBox {
id: enableAudioVoicesBox
text: qsTr("Enable audio voices")
checked: isAudioVoicesEnabled
onCheckedChanged: {
isAudioVoicesEnabled = checked;
}
}
GCDialogCheckBox {
id: enableAudioEffectsBox
text: qsTr("Enable audio effects")
checked: isAudioEffectsEnabled
onCheckedChanged: {
isAudioEffectsEnabled = checked;
}
}
+ Flow {
+ spacing: 5 * ApplicationInfo.ratio
+ width: parent.width
+ GCText {
+ id: audioEffectsVolumeText
+ text: qsTr("Audio effects volume")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ }
+
+ Flow {
+ spacing: 5 * ApplicationInfo.ratio
+ width: parent.width
+ GCSlider {
+ id: audioEffectsVolumeSlider
+ width: 250 * ApplicationInfo.ratio
+ maximumValue: 10
+ minimumValue: 0
+ value: audioEffectsVolume * 10
+ onValueChanged: ApplicationSettings.audioEffectsVolume = value / 10;
+ scrollEnabled: false
+ }
+ }
+
+ GCDialogCheckBox {
+ id: enableBackgroundMusicBox
+ text: qsTr("Enable background music")
+ checked: isBackgroundMusicEnabled
+ onCheckedChanged: {
+ isBackgroundMusicEnabled = checked;
+ }
+ }
+
+ Flow {
+ spacing: 5 * ApplicationInfo.ratio
+ width: parent.width
+ GCText {
+ text: qsTr("Background Music")
+ fontSize: mediumSize
+ height: 50 * ApplicationInfo.ratio
+ }
+ Image {
+ source: "qrc:/gcompris/src/core/resource/bar_next.svg"
+ height: Math.min(50 * ApplicationInfo.ratio, parent.width / 8)
+ sourceSize.width: height
+
+ MouseArea {
+ anchors.fill: parent
+ enabled: (backgroundMusic.playbackState == Audio.PlayingState && !backgroundMusic.muted)
+ onClicked: backgroundMusic.nextAudio()
+ }
+ }
+ }
+
+ Flow {
+ width: parent.width
+ spacing: 5 * ApplicationInfo.ratio
+
+ Button {
+ id: backgroundMusicName
+ height: 30 * ApplicationInfo.ratio
+ width: background.width * 0.8
+ text: {
+ if(backgroundMusic.playbackState != Audio.PlayingState)
+ return qsTr("Not playing")
+ else if (backgroundMusic.metaDataMusic[0] != undefined)
+ return (qsTr("Title: %1 Artist: %2").arg(backgroundMusic.metaDataMusic[0]).arg(backgroundMusic.metaDataMusic[1]))
+ else if (String(backgroundMusic.source).slice(0, 37) === "qrc:/gcompris/src/core/resource/intro")
+ return qsTr("Introduction music")
+ return ""
+ }
+ style: GCButtonStyle {}
+ onClicked: {
+ dialogConfig.visible = false
+ backgroundMusicList.visible = true
+ }
+ }
+ }
+
+ Flow {
+ spacing: 5
+ width: parent.width
+ GCText {
+ id: backgroundMusicVolumeText
+ text: qsTr("Background music volume")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ }
+
+ GCSlider {
+ id: backgroundMusicVolumeSlider
+ width: 250 * ApplicationInfo.ratio
+ maximumValue: 10
+ minimumValue: 0
+ value: backgroundMusicVolume * 10
+ onValueChanged: ApplicationSettings.backgroundMusicVolume = value / 10;
+ scrollEnabled: false
+ }
+
GCDialogCheckBox {
id: enableFullscreenBox
text: qsTr("Fullscreen")
checked: isFullscreen
onCheckedChanged: {
isFullscreen = checked;
}
visible: !ApplicationInfo.isMobile
}
GCDialogCheckBox {
id: enableVirtualKeyboardBox
text: qsTr("Virtual Keyboard")
checked: isVirtualKeyboard
onCheckedChanged: {
isVirtualKeyboard = checked;
}
}
GCDialogCheckBox {
id: enableAutomaticDownloadsBox
checked: isAutomaticDownloadsEnabled
text: qsTr("Enable automatic downloads/updates of sound files")
visible: ApplicationInfo.isDownloadAllowed
onCheckedChanged: {
isAutomaticDownloadsEnabled = checked;
}
}
/* Technically wordset config is a string that holds the wordset name or '' for the
* internal wordset. But as we support only internal and words its best to show the
* user a boolean choice.
*/
GCDialogCheckBox {
id: wordsetBox
checked: DownloadManager.isDataRegistered("words")
text: enabled ? qsTr("Use full word image set") : qsTr("Download full word image set")
visible: ApplicationInfo.isDownloadAllowed
enabled: !DownloadManager.isDataRegistered("words")
onCheckedChanged: {
wordset = checked ? 'data2/words/words.rcc' : '';
}
}
GCDialogCheckBox {
id: sectionVisibleBox
checked: sectionVisible
text: qsTr("The activity section menu is visible")
onCheckedChanged: {
sectionVisible = checked;
}
}
Flow {
spacing: 5
width: parent.width
GCComboBox {
id: fontBox
model: fonts
background: dialogActivityConfig
label: qsTr("Font selector")
}
}
+ GCText {
+ id: baseFontSizeText
+ text: qsTr("Font size")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
Flow {
spacing: 5
width: parent.width
GCSlider {
id: baseFontSizeSlider
width: 250 * ApplicationInfo.ratio
maximumValue: ApplicationSettings.baseFontSizeMax
minimumValue: ApplicationSettings.baseFontSizeMin
value: baseFontSize
onValueChanged: ApplicationSettings.baseFontSize = value;
scrollEnabled: false
}
- GCText {
- id: baseFontSizeText
- text: qsTr("Font size")
- fontSize: mediumSize
- wrapMode: Text.WordWrap
- }
Button {
height: 30 * ApplicationInfo.ratio
text: qsTr("Default");
style: GCButtonStyle {}
onClicked: baseFontSizeSlider.value = 0.0
}
}
Flow {
spacing: 5
width: parent.width
GCComboBox {
id: fontCapitalizationBox
model: fontCapitalizationModel
background: dialogActivityConfig
label: qsTr("Font Capitalization")
}
}
+ GCText {
+ id: fontLetterSpacingText
+ text: qsTr("Font letter spacing")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
Flow {
spacing: 5
width: parent.width
GCSlider {
id: fontLetterSpacingSlider
width: 250 * ApplicationInfo.ratio
maximumValue: ApplicationSettings.fontLetterSpacingMax
minimumValue: ApplicationSettings.fontLetterSpacingMin
value: fontLetterSpacing
onValueChanged: ApplicationSettings.fontLetterSpacing = value;
scrollEnabled: false
}
- GCText {
- id: fontLetterSpacingText
- text: qsTr("Font letter spacing")
- fontSize: mediumSize
- wrapMode: Text.WordWrap
- }
Button {
height: 30 * ApplicationInfo.ratio
text: qsTr("Default");
style: GCButtonStyle {}
onClicked: fontLetterSpacingSlider.value = ApplicationSettings.fontLetterSpacingMin
}
}
Flow {
spacing: 5
width: parent.width
GCComboBox {
id: languageBox
model: dialogConfig.languages
background: dialogActivityConfig
onCurrentIndexChanged: voicesRow.localeChanged();
label: qsTr("Language selector")
}
}
Flow {
id: voicesRow
width: parent.width
spacing: 5 * ApplicationInfo.ratio
property bool haveLocalResource: false
function localeChanged() {
var language = dialogConfig.languages[languageBox.currentIndex].text;
voicesRow.haveLocalResource = DownloadManager.isDataRegistered(
"voices-" + ApplicationInfo.CompressedAudio + "/" +
ApplicationInfo.getVoicesLocale(dialogConfig.languages[languageBox.currentIndex].locale)
)
}
Connections {
target: DownloadManager
onDownloadFinished: voicesRow.localeChanged()
}
GCText {
id: voicesText
text: qsTr("Localized voices")
fontSize: mediumSize
wrapMode: Text.WordWrap
}
Image {
id: voicesImage
sourceSize.height: 30 * ApplicationInfo.ratio
source: voicesRow.haveLocalResource ? "qrc:/gcompris/src/core/resource/apply.svg" :
"qrc:/gcompris/src/core/resource/cancel.svg"
}
Button {
id: voicesButton
height: 30 * ApplicationInfo.ratio
visible: ApplicationInfo.isDownloadAllowed
text: voicesRow.haveLocalResource ? qsTr("Check for updates") :
qsTr("Download")
style: GCButtonStyle {}
onClicked: {
if (DownloadManager.downloadResource(
DownloadManager.getVoicesResourceForLocale(dialogConfig.languages[languageBox.currentIndex].locale)))
{
var downloadDialog = Core.showDownloadDialog(dialogConfig.parent.rootItem, {});
}
}
}
}
Flow {
width: parent.width
spacing: 5 * ApplicationInfo.ratio
GCText {
text: qsTr("Difficulty filter:")
fontSize: mediumSize
height: 50 * ApplicationInfo.ratio
}
+ }
- // Padding
- Item {
- height: 1
- width: 10 * ApplicationInfo.ratio
- }
+ Flow {
+ width: parent.width
+ spacing: 5 * ApplicationInfo.ratio
Image {
source: "qrc:/gcompris/src/core/resource/bar_next.svg"
sourceSize.height: Math.min(50 * ApplicationInfo.ratio, parent.width / 8)
MouseArea {
anchors.fill: parent
onClicked: {
filterRepeater.setMin(filterRepeater.min + 1)
}
}
}
- // Padding
- Item {
- height: 1
- width: 5 * ApplicationInfo.ratio
- }
-
// Level filtering
Repeater {
id: filterRepeater
model: 6
property int min: ApplicationSettings.filterLevelMin
property int max: ApplicationSettings.filterLevelMax
function setMin(value) {
var newMin
if(min < 1)
newMin = 1
else if(min > 6)
newMin = 6
else if(max >= value)
newMin = value
if(newMin)
ApplicationSettings.filterLevelMin = newMin
}
function setMax(value) {
var newMax
if(max < 1)
newMax = 1
else if(max > 6)
newMax = 6
else if(min <= value)
newMax = value
if(newMax)
ApplicationSettings.filterLevelMax = newMax
}
Image {
source: "qrc:/gcompris/src/core/resource/difficulty" +
(modelData + 1) + ".svg";
sourceSize.width: Math.min(50 * ApplicationInfo.ratio, parent.width / 8)
opacity: modelData + 1 >= filterRepeater.min &&
modelData + 1 <= filterRepeater.max
? 1 : 0.4
property int value: modelData + 1
MouseArea {
anchors.fill: parent
onClicked: {
if(parent.value < filterRepeater.max) {
if(parent.opacity == 1)
filterRepeater.setMin(parent.value + 1)
else
filterRepeater.setMin(parent.value)
} else if(parent.value > filterRepeater.min) {
if(parent.opacity == 1)
filterRepeater.setMax(parent.value - 1)
else
filterRepeater.setMax(parent.value)
}
}
}
}
}
- // Padding
- Item {
- height: 1
- width: 5 * ApplicationInfo.ratio
- }
-
Image {
source: "qrc:/gcompris/src/core/resource/bar_previous.svg"
sourceSize.height: Math.min(50 * ApplicationInfo.ratio, parent.width / 8)
MouseArea {
anchors.fill: parent
onClicked: {
filterRepeater.setMax(filterRepeater.max - 1)
}
}
}
}
}
property bool showLockedActivities: ApplicationSettings.showLockedActivities
property bool isAudioVoicesEnabled: ApplicationSettings.isAudioVoicesEnabled
property bool isAudioEffectsEnabled: ApplicationSettings.isAudioEffectsEnabled
+ property bool isBackgroundMusicEnabled: ApplicationSettings.isBackgroundMusicEnabled
property bool isFullscreen: ApplicationSettings.isFullscreen
property bool isVirtualKeyboard: ApplicationSettings.isVirtualKeyboard
property bool isAutomaticDownloadsEnabled: ApplicationSettings.isAutomaticDownloadsEnabled
property bool sectionVisible: ApplicationSettings.sectionVisible
property string wordset: ApplicationSettings.wordset
+ property var filteredBackgroundMusic: ApplicationSettings.filteredBackgroundMusic
+ property var allBackgroundMusic: ApplicationInfo.getBackgroundMusicFromRcc()
property int baseFontSize // don't bind to ApplicationSettings.baseFontSize
property real fontLetterSpacing // don't bind to ApplicationSettings.fontLetterSpacing
// or we get a binding loop warning
-
+ property real backgroundMusicVolume
+ property real audioEffectsVolume
+
+ function extractMusicNameFromPath(musicPath) {
+ var musicDirectoryPath = ApplicationInfo.getAudioFilePath("backgroundMusic/")
+ var musicName = String(musicPath)
+ musicName = musicName.slice(musicDirectoryPath.length, musicName.length)
+ return musicName.slice(0, musicName.lastIndexOf('.'))
+ }
+
function loadFromConfig() {
// Synchronize settings with data
showLockedActivities = ApplicationSettings.showLockedActivities
isAudioVoicesEnabled = ApplicationSettings.isAudioVoicesEnabled
enableAudioVoicesBox.checked = isAudioVoicesEnabled
isAudioEffectsEnabled = ApplicationSettings.isAudioEffectsEnabled
enableAudioEffectsBox.checked = isAudioEffectsEnabled
+ isBackgroundMusicEnabled = ApplicationSettings.isBackgroundMusicEnabled
+ enableBackgroundMusicBox.checked = isBackgroundMusicEnabled
+
isFullscreen = ApplicationSettings.isFullscreen
enableFullscreenBox.checked = isFullscreen
isVirtualKeyboard = ApplicationSettings.isVirtualKeyboard
enableVirtualKeyboardBox.checked = isVirtualKeyboard
isAutomaticDownloadsEnabled = ApplicationSettings.isAutomaticDownloadsEnabled
enableAutomaticDownloadsBox.checked = isAutomaticDownloadsEnabled
sectionVisible = ApplicationSettings.sectionVisible
sectionVisibleBox.checked = sectionVisible
wordset = ApplicationSettings.wordset
wordsetBox.checked = DownloadManager.isDataRegistered("words") || ApplicationSettings.wordset == 'data2/words/words.rcc'
wordsetBox.enabled = !DownloadManager.isDataRegistered("words")
- baseFontSize = ApplicationSettings.baseFontSize;
- fontLetterSpacing = ApplicationSettings.fontLetterSpacing;
+ baseFontSize = ApplicationSettings.baseFontSize
+ fontLetterSpacing = ApplicationSettings.fontLetterSpacing
+ backgroundMusicVolume = ApplicationSettings.backgroundMusicVolume
+ audioEffectsVolume = ApplicationSettings.audioEffectsVolume
+ filteredBackgroundMusic = ApplicationSettings.filteredBackgroundMusic
+ allBackgroundMusic = ApplicationInfo.getBackgroundMusicFromRcc()
+ if(filteredBackgroundMusic.length === 0)
+ filteredBackgroundMusic = allBackgroundMusic
// Set locale
for(var i = 0 ; i < dialogConfig.languages.length ; i ++) {
if(dialogConfig.languages[i].locale === ApplicationSettings.locale) {
languageBox.currentIndex = i;
break;
}
}
// Set font
for(var i = 0 ; i < fonts.count ; i ++) {
if(fonts.get(i).text == ApplicationSettings.font) {
fontBox.currentIndex = i;
break;
}
}
// Set font capitalization
for(var i = 0 ; i < fontCapitalizationModel.length ; i ++) {
if(fontCapitalizationModel[i].value == ApplicationSettings.fontCapitalization) {
fontCapitalizationBox.currentIndex = i;
break;
}
}
}
function save() {
ApplicationSettings.showLockedActivities = showLockedActivities
ApplicationSettings.isAudioVoicesEnabled = isAudioVoicesEnabled
ApplicationSettings.isAudioEffectsEnabled = isAudioEffectsEnabled
+ ApplicationSettings.isBackgroundMusicEnabled = isBackgroundMusicEnabled
+ ApplicationSettings.filteredBackgroundMusic = filteredBackgroundMusic
ApplicationSettings.isFullscreen = isFullscreen
ApplicationSettings.isVirtualKeyboard = isVirtualKeyboard
ApplicationSettings.isAutomaticDownloadsEnabled = isAutomaticDownloadsEnabled
ApplicationSettings.sectionVisible = sectionVisible
ApplicationSettings.wordset = wordset
-
ApplicationSettings.isEmbeddedFont = fonts.get(fontBox.currentIndex).isLocalResource;
ApplicationSettings.font = fonts.get(fontBox.currentIndex).text
ApplicationSettings.fontCapitalization = fontCapitalizationModel[fontCapitalizationBox.currentIndex].value
ApplicationSettings.saveBaseFontSize();
ApplicationSettings.notifyFontLetterSpacingChanged();
if (ApplicationSettings.locale != dialogConfig.languages[languageBox.currentIndex].locale) {
ApplicationSettings.locale = dialogConfig.languages[languageBox.currentIndex].locale
if(ApplicationInfo.isDownloadAllowed && !DownloadManager.isDataRegistered(
"voices-" + ApplicationInfo.CompressedAudio + "/" +
ApplicationInfo.getVoicesLocale(dialogConfig.languages[languageBox.currentIndex].locale)
))
{
// ask for downloading new voices
Core.showMessageDialog(main,
qsTr("You selected a new locale. You need to restart GCompris to play in your new locale.<br/>Do you want to download the corresponding sound files now?"),
qsTr("Yes"), function() {
// yes -> start download
if (DownloadManager.downloadResource(
DownloadManager.getVoicesResourceForLocale(ApplicationSettings.locale)))
var downloadDialog = Core.showDownloadDialog(main, {});
},
qsTr("No"), null,
null
);
} else {
// check for updates or/and register new voices
DownloadManager.updateResource(
DownloadManager.getVoicesResourceForLocale(ApplicationSettings.locale))
}
}
// download words.rcc if needed
if(ApplicationSettings.wordset != "") {
// we want to use the external dataset, it is either in
// words/words.rcc or full-${CA}.rcc
if(DownloadManager.isDataRegistered("words")) {
// we either have it, we try to update in the background
// or we are downloading it
if(DownloadManager.haveLocalResource(wordset))
DownloadManager.updateResource(wordset)
}
else {
// download automatically if automatic download else ask for download
if(isAutomaticDownloadsEnabled) {
var prevAutomaticDownload = ApplicationSettings.isAutomaticDownloadsEnabled
ApplicationSettings.isAutomaticDownloadsEnabled = true;
DownloadManager.updateResource(wordset);
ApplicationSettings.isAutomaticDownloadsEnabled = prevAutomaticDownload
}
else {
Core.showMessageDialog(main,
qsTr("The images for several activities are not yet installed. ")
+ qsTr("Do you want to download them now?"),
qsTr("Yes"),
function() {
if (DownloadManager.downloadResource(wordset))
var downloadDialog = Core.showDownloadDialog(pageView.currentItem, {});
},
qsTr("No"), function() { ApplicationSettings.wordset = '' },
null
);
}
}
}
- }
+
+ // download backgroundMusic.rcc if needed
+ if(DownloadManager.isDataRegistered("backgroundMusic")) {
+ // we either have it, we try to update in the background
+ // or we are downloading it
+ if(DownloadManager.haveLocalResource(DownloadManager.getBackgroundMusicResources()))
+ DownloadManager.updateResource(DownloadManager.getBackgroundMusicResources())
+ }
+ else {
+ // download automatically if automatic download else ask for download
+ if(isAutomaticDownloadsEnabled) {
+ var prevAutomaticDownload = ApplicationSettings.isAutomaticDownloadsEnabled
+ ApplicationSettings.isAutomaticDownloadsEnabled = true;
+ DownloadManager.updateResource(DownloadManager.getBackgroundMusicResources());
+ ApplicationSettings.isAutomaticDownloadsEnabled = prevAutomaticDownload
+ }
+ else {
+ Core.showMessageDialog(main,
+ qsTr("The background music is not yet installed. ")
+ + qsTr("Do you want to download it now?"),
+ qsTr("Yes"),
+ function() {
+ if (DownloadManager.downloadResource(DownloadManager.getBackgroundMusicResources()))
+ var downloadDialog = Core.showDownloadDialog(pageView.currentItem, {});
+ },
+ qsTr("No"),null
+ );
+ }
+ }
+ }
ListModel {
id: fonts
Component.onCompleted: {
var systemFonts = Qt.fontFamilies();
var rccFonts = ApplicationInfo.getFontsFromRcc();
// Remove explicitly all *symbol* and *ding* fonts
var excludedFonts = ApplicationInfo.getSystemExcludedFonts();
excludedFonts.push("ding");
excludedFonts.push("symbol");
// first display fonts from rcc
for(var i = 0 ; i < rccFonts.length ; ++ i) {
// Append fonts from resources
fonts.append({ "text": rccFonts[i], "isLocalResource": true });
}
for(var i = 0 ; i < systemFonts.length ; ++ i) {
var isExcluded = false;
var systemFont = systemFonts[i].toLowerCase();
// Remove symbol fonts
for(var j = 0 ; j < excludedFonts.length ; ++ j) {
if(systemFont.indexOf(excludedFonts[j].toLowerCase()) != -1) {
isExcluded = true;
break;
}
}
// Remove fonts from rcc (if you have a default font from rcc, Qt will add it to systemFonts)
for(var j = 0 ; j < rccFonts.length ; ++ j) {
if(rccFonts[j].toLowerCase().indexOf(systemFont) != -1) {
isExcluded = true;
break;
}
}
// Finally, we know if we add this font or not
if(!isExcluded) {
fonts.append({ "text": systemFonts[i], "isLocalResource": false });
}
}
}
}
property var fontCapitalizationModel: [
{ text: qsTr("Mixed case (default)"), value: Font.MixedCase },
{ text: qsTr("All uppercase"), value: Font.AllUppercase },
{ text: qsTr("All lowercase"), value: Font.AllLowercase }
]
+
+ function isFilteredBackgroundMusicChanged() {
+ initialFilteredMusic = ApplicationSettings.filteredBackgroundMusic
+ if(initialFilteredMusic.length != filteredBackgroundMusic.length)
+ return true
+ for(var i = 0; i < initialFilteredMusic.length; i++)
+ if(filteredBackgroundMusic.indexOf(initialFilteredMusic[i]) == -1)
+ return true
+
+ return false
+ }
function hasConfigChanged() {
return (ApplicationSettings.locale !== dialogConfig.languages[languageBox.currentIndex].locale ||
(ApplicationSettings.sectionVisible != sectionVisible) ||
(ApplicationSettings.wordset != wordset) ||
(ApplicationSettings.font != fonts.get(fontBox.currentIndex).text) ||
(ApplicationSettings.isEmbeddedFont != fonts.get(fontBox.currentIndex).isLocalResource) ||
(ApplicationSettings.isEmbeddedFont != fonts.get(fontBox.currentIndex).isLocalResource) ||
(ApplicationSettings.fontCapitalization != fontCapitalizationModel[(fontcapitalizationBox.currentIndex)].value) ||
(ApplicationSettings.fontLetterSpacing != fontLetterSpacing) ||
(ApplicationSettings.isAudioVoicesEnabled != isAudioVoicesEnabled) ||
(ApplicationSettings.isAudioEffectsEnabled != isAudioEffectsEnabled) ||
+ (ApplicationSettings.isBackgroundMusicEnabled != isBackgroundMusicEnabled) ||
(ApplicationSettings.isFullscreen != isFullscreen) ||
(ApplicationSettings.isVirtualKeyboard != isVirtualKeyboard) ||
(ApplicationSettings.isAutomaticDownloadsEnabled != isAutomaticDownloadsEnabled) ||
(ApplicationSettings.baseFontSize != baseFontSize) ||
- (ApplicationSettings.showLockedActivities != showLockedActivities)
+ (ApplicationSettings.showLockedActivities != showLockedActivities) ||
+ isFilteredBackgroundMusicChanged()
);
}
}
diff --git a/src/activities/menu/Menu.qml b/src/activities/menu/Menu.qml
index a26557ca0..b8d0b033b 100644
--- a/src/activities/menu/Menu.qml
+++ b/src/activities/menu/Menu.qml
@@ -1,915 +1,955 @@
/* GCompris - Menu.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "../../core"
import GCompris 1.0
import QtGraphicalEffects 1.0
import "qrc:/gcompris/src/core/core.js" as Core
import QtQuick.Controls 1.5
import QtQuick.Controls.Styles 1.4
/**
* GCompris' top level menu screen.
*
* Displays a grid of available activities divided subdivided in activity
* categories/sections.
*
* The visibility of the section row is toggled by the setting
* ApplicationSettings.sectionVisible.
*
* The list of available activities depends on the following settings:
*
* * ApplicationSettings.showLockedActivities
* * ApplicationSettings.filterLevelMin
* * ApplicationSettings.filterLevelMax
*
* @inherit QtQuick.Item
*/
ActivityBase {
id: activity
focus: true
activityInfo: ActivityInfoTree.rootMenu
onBack: {
pageView.pop(to);
// Restore focus that has been taken by the loaded activity
if(pageView.currentItem == activity)
focus = true;
}
onHome: {
if(pageView.depth === 1 && !ApplicationSettings.isKioskMode) {
Core.quit(main);
}
else {
pageView.pop();
// Restore focus that has been taken by the loaded activity
if(pageView.currentItem == activity)
focus = true;
}
}
onDisplayDialog: pageView.push(dialog)
onDisplayDialogs: {
var toPush = new Array();
for (var i = 0; i < dialogs.length; i++) {
toPush.push({item: dialogs[i]});
}
pageView.push(toPush);
}
Connections {
// At the launch of the application, box2d check is performed after we
// first initialize the menu. This connection is to refresh
// automatically the menu at start.
target: ApplicationInfo
onIsBox2DInstalledChanged: {
ActivityInfoTree.filterByTag(activity.currentTag, currentCategory)
ActivityInfoTree.filterLockedActivities()
ActivityInfoTree.filterEnabledActivities()
}
}
// @cond INTERNAL_DOCS
property string url: "qrc:/gcompris/src/activities/menu/resource/"
property var sections: [
{
icon: activity.url + "all.svg",
tag: "favorite"
},
{
icon: activity.url + "computer.svg",
tag: "computer"
},
{
icon: activity.url + "discovery.svg",
tag: "discovery",
categories: [{ "logic": qsTr("Logic") },
{ "arts": qsTr("Fine Arts") },
{ "music": qsTr("Music") }
]
},
{
icon: activity.url + "sciences.svg",
tag: "sciences",
categories: [{ "experiment": qsTr("Experiment") },
{ "history": qsTr("History") },
{ "geography": qsTr("Geography") }
]
},
{
icon: activity.url + "fun.svg",
tag: "fun"
},
{
icon: activity.url + "math.svg",
tag: "math",
categories: [{ "numeration": qsTr("Numeration") },
{ "arithmetic": qsTr("Arithmetic") },
{ "measures": qsTr("Measures") }
]
},
{
icon: activity.url + "puzzle.svg",
tag: "puzzle"
},
{
icon: activity.url + "reading.svg",
tag: "reading",
categories: [{ "letters": qsTr("Letters") },
{ "words": qsTr("Words") },
{ "vocabulary": qsTr("Vocabulary") }
]
},
{
icon: activity.url + "strategy.svg",
tag: "strategy"
},
{
icon: activity.url + "search-icon.svg",
tag: "search"
}
]
property string currentTag: sections[0].tag
property var currentTagCategories: []
property string currentCategory: ""
/// @endcond
property string clickMode: "play"
pageComponent: Image {
id: background
source: activity.url + "background.svg"
sourceSize.width: Math.max(parent.width, parent.height)
height: main.height
fillMode: Image.PreserveAspectCrop
Timer {
// triggered once at startup to populate the keyboard
id: keyboardFiller
interval: 1000; running: true;
onTriggered: { keyboard.populate(); }
}
function loadActivity() {
// @TODO init of item would be better in setsource but it crashes on Qt5.6
// https://bugreports.qt.io/browse/QTBUG-49793
activityLoader.item.audioVoices = audioVoices
activityLoader.item.audioEffects = audioEffects
activityLoader.item.loading = loading
//take the focus away from textField before starting an activity
searchTextField.focus = false
pageView.push(activityLoader.item)
}
Loader {
id: activityLoader
asynchronous: true
onStatusChanged: {
if (status == Loader.Loading) {
loading.start();
} else if (status == Loader.Ready) {
loading.stop();
loadActivity();
} else if (status == Loader.Error)
loading.stop();
}
}
// Filters
property bool horizontal: main.width >= main.height
property int sectionIconWidth: {
if(horizontal)
return Math.min(100 * ApplicationInfo.ratio, main.width / (sections.length + 1))
else if(activity.currentTag === "search" && ApplicationSettings.isVirtualKeyboard)
return Math.min(100 * ApplicationInfo.ratio, (background.height - (bar.height+keyboard.height)) / (sections.length + 1))
else
return Math.min(100 * ApplicationInfo.ratio, (background.height - bar.height) / (sections.length + 1))
}
property int sectionIconHeight: sectionIconWidth
property int sectionCellWidth: sectionIconWidth * 1.1
property int sectionCellHeight: sectionIconHeight * 1.1
+ property int categoriesHeight: currentCategory == "" ? 0 : sectionCellHeight - 2
property var currentActiveGrid: activitiesGrid
property bool keyboardMode: false
Keys.onPressed: {
// Ctrl-modifiers should never be handled by the search-field
if (event.modifiers === Qt.ControlModifier) {
if (event.key === Qt.Key_S) {
// Ctrl+S toggle show / hide section
ApplicationSettings.sectionVisible = !ApplicationSettings.sectionVisible
}
} else if(currentTag === "search") {
// forward to the virtual keyboard the pressed keys
if(event.key == Qt.Key_Backspace)
keyboard.keypress(keyboard.backspace);
else
keyboard.keypress(event.text);
} else if(event.key === Qt.Key_Space && currentActiveGrid.currentItem) {
currentActiveGrid.currentItem.selectCurrentItem()
}
}
Keys.onReleased: {
keyboardMode = true
event.accepted = false
}
Keys.onTabPressed: {
if(currentActiveGrid == section) {
if(currentTagCategories && currentTagCategories.length != 0) {
currentActiveGrid = categoriesGrid;
}
else {
currentActiveGrid = activitiesGrid;
}
}
else if(currentActiveGrid == categoriesGrid) {
currentActiveGrid = activitiesGrid;
}
else {
currentActiveGrid = section;
}
}
Keys.onEnterPressed: if(currentActiveGrid.currentItem) currentActiveGrid.currentItem.selectCurrentItem();
Keys.onReturnPressed: if(currentActiveGrid.currentItem) currentActiveGrid.currentItem.selectCurrentItem();
Keys.onRightPressed: if(currentActiveGrid.currentItem) currentActiveGrid.moveCurrentIndexRight();
Keys.onLeftPressed: if(currentActiveGrid.currentItem) currentActiveGrid.moveCurrentIndexLeft();
Keys.onDownPressed: if(currentActiveGrid.currentItem && !currentActiveGrid.atYEnd) currentActiveGrid.moveCurrentIndexDown();
Keys.onUpPressed: if(currentActiveGrid.currentItem && !currentActiveGrid.atYBeginning) currentActiveGrid.moveCurrentIndexUp();
GridView {
id: section
model: sections
width: horizontal ? main.width : sectionCellWidth
height: {
if(horizontal)
return sectionCellHeight
else if(activity.currentTag === "search" && ApplicationSettings.isVirtualKeyboard)
return sectionCellHeight * (sections.length+1)
else
return main.height - bar.height
}
x: ApplicationSettings.sectionVisible ? section.initialX : -sectionCellWidth
y: ApplicationSettings.sectionVisible ? section.initialY : -sectionCellHeight
visible: ApplicationSettings.sectionVisible
cellWidth: sectionCellWidth
cellHeight: sectionCellHeight
interactive: false
keyNavigationWraps: true
property int initialX: 4
property int initialY: 4
Component {
id: sectionDelegate
Item {
id: backgroundSection
width: sectionCellWidth
height: sectionCellHeight
Image {
source: modelData.icon
sourceSize.height: sectionIconHeight
anchors.margins: 5
anchors.horizontalCenter: parent.horizontalCenter
}
ParticleSystemStarLoader {
id: particles
anchors.fill: backgroundSection
clip: false
}
MouseArea {
anchors.fill: backgroundSection
onClicked: {
selectCurrentItem()
}
}
function selectCurrentItem() {
section.currentIndex = index
activity.currentTag = modelData.tag
activity.currentTagCategories = modelData.categories
if(modelData.categories != undefined) {
currentCategory = Object.keys(modelData.categories[0])[0];
}
else {
currentCategory = ""
}
particles.burst(10)
if(modelData.tag === "search") {
ActivityInfoTree.filterBySearch(searchTextField.text);
}
else {
ActivityInfoTree.filterByTag(modelData.tag, currentCategory)
ActivityInfoTree.filterLockedActivities()
ActivityInfoTree.filterEnabledActivities()
}
}
}
}
delegate: sectionDelegate
highlight: Item {
width: sectionCellWidth
height: sectionCellHeight
Rectangle {
anchors.fill: parent
color: "#5AFFFFFF"
}
Image {
source: "qrc:/gcompris/src/core/resource/button.svg"
anchors.fill: parent
}
Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } }
Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } }
}
}
// Activities
property int iconWidth: 120 * ApplicationInfo.ratio
property int activityCellWidth:
horizontal ? background.width / Math.floor(background.width / iconWidth) :
(background.width - section.width) / Math.floor((background.width - section.width) / iconWidth)
property int activityCellHeight: iconWidth * 1.7
Loader {
id: warningOverlay
anchors {
top: horizontal ? section.bottom : parent.top
bottom: parent.bottom
left: horizontal ? parent.left : section.right
right: parent.right
margins: 4
}
active: (ActivityInfoTree.menuTree.length === 0) && (currentTag === "favorite")
sourceComponent: Item {
anchors.fill: parent
GCText {
id: instructionTxt
fontSize: smallSize
y: height * 0.2
x: (parent.width - width) / 2
z: 2
width: parent.width * 0.6
horizontalAlignment: Text.AlignHCenter
wrapMode: Text.WordWrap
font.weight: Font.DemiBold
color: 'white'
text: qsTr("Put your favorite activities here by selecting the " +
"sun at the top right of that activity.")
}
Rectangle {
anchors.fill: instructionTxt
anchors.margins: -6
z: 1
opacity: 0.5
radius: 10
border.width: 2
border.color: "black"
gradient: Gradient {
GradientStop { position: 0.0; color: "#000" }
GradientStop { position: 0.9; color: "#666" }
GradientStop { position: 1.0; color: "#AAA" }
}
}
}
}
GridView {
id: categoriesGrid
model: currentTagCategories
anchors.top: horizontal ? section.bottom : parent.top
+ topMargin: 5
interactive: false
keyNavigationWraps: true
width: horizontal ? main.width : main.width - section.width
visible: activity.currentTag !== "search"
x: {
if(currentTagCategories) {
if(horizontal) {
return categoriesGrid.width / (4 * (currentTagCategories.length+1))
}
else {
return categoriesGrid.width / (4 * (currentTagCategories.length+1)) + section.width
}
}
else {
return 0
}
}
cellWidth: currentTagCategories ? categoriesGrid.width / currentTagCategories.length : 0
cellHeight: height
- height: searchTextField.height
+ height: horizontal ? categoriesHeight * 0.5 : categoriesHeight
delegate: Button {
id: button
style: GCButtonStyle {
selected: currentCategory === button.category
+ theme: "categories"
+ textSize: "regular"
+ haveIconRight: horizontal
}
width: categoriesGrid.width / (currentTagCategories.length + 1)
height: categoriesGrid.cellHeight
- text: Object.values(modelData)[0]
+ text: modelData[category]
property string category: Object.keys(modelData)[0]
onClicked: {
selectCurrentItem()
}
function selectCurrentItem() {
categoriesGrid.currentIndex = index
currentCategory = Object.keys(modelData)[0]
ActivityInfoTree.filterByTag(currentTag, currentCategory)
ActivityInfoTree.filterLockedActivities()
ActivityInfoTree.filterEnabledActivities()
}
+ Image {
+ visible: horizontal
+ source: "qrc:/gcompris/src/activities/menu/resource/category-" + button.category + ".svg";
+ height: Math.round(parent.height * 0.8)
+ sourceSize.height: height
+ width: height
+ anchors {
+ verticalCenter: parent.verticalCenter
+ right: parent.right
+ rightMargin: parent.height * 0.1
+ }
+ }
}
highlight: Rectangle {
+ z: 10
width: activityCellWidth - activitiesGrid.spacing
height: activityCellHeight - activitiesGrid.spacing
- color: "#AAFFFFFF"
- border.width: 3
- border.color: "black"
- visible: background.keyboardMode
+ color: "#00FFFFFF"
+ radius: 10
+ border.width: 5
+ border.color: "#FF87A6DD"
+ visible: true
Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } }
Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } }
}
}
GridView {
id: activitiesGrid
anchors {
top: {
if(searchBar.visible)
return searchBar.bottom
else
return categoriesGrid.bottom
}
bottom: bar.top
left: horizontal ? parent.left : section.right
margins: 4
+ topMargin: currentCategory == "" ? 4 : 10
}
width: background.width
cellWidth: activityCellWidth
cellHeight: activityCellHeight
clip: true
model: ActivityInfoTree.menuTree
keyNavigationWraps: true
property int spacing: 10
delegate: Item {
id: delegateItem
width: activityCellWidth - activitiesGrid.spacing
height: activityCellHeight - activitiesGrid.spacing
enabled: clickMode === "play" || dialogChooseLevel.hasConfigOrDataset
Rectangle {
id: activityBackground
width: parent.width
height: parent.height
anchors.horizontalCenter: parent.horizontalCenter
color: "white"
opacity: 0.5
}
Image {
source: "qrc:/gcompris/src/activities/" + icon;
anchors.top: activityBackground.top
anchors.horizontalCenter: parent.horizontalCenter
width: iconWidth - activitiesGrid.spacing
height: width
sourceSize.width: width
fillMode: Image.PreserveAspectFit
anchors.margins: 5
opacity: delegateItem.enabled ? 1 : 0.5
Image {
source: "qrc:/gcompris/src/core/resource/difficulty" +
ActivityInfoTree.menuTree[index].difficulty + ".svg";
anchors.top: parent.top
sourceSize.width: iconWidth * 0.15
x: 5
}
Image {
anchors {
horizontalCenter: parent.horizontalCenter
top: parent.top
rightMargin: 4
}
source: demo || !ApplicationSettings.isDemoMode
? "" :
activity.url + "lock.svg"
sourceSize.width: 30 * ApplicationInfo.ratio
}
Image {
anchors {
left: parent.left
bottom: parent.bottom
}
source: ActivityInfoTree.menuTree[index].createdInVersion == ApplicationInfo.GCVersionCode
? activity.url + "new.svg" : ""
sourceSize.width: 30 * ApplicationInfo.ratio
}
GCText {
id: title
anchors.top: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
width: activityBackground.width
fontSizeMode: Text.Fit
minimumPointSize: 7
fontSize: regularSize
elide: Text.ElideRight
maximumLineCount: 2
wrapMode: Text.WordWrap
text: ActivityInfoTree.menuTree[index].title
}
- // If we have enough room at the bottom display the description
- GCText {
- id: description
- visible: delegateItem.height - (title.y + title.height) > description.height ? 1 : 0
- anchors.top: title.bottom
- anchors.horizontalCenter: parent.horizontalCenter
- horizontalAlignment: Text.AlignHCenter
- width: activityBackground.width
- fontSizeMode: Text.Fit
- minimumPointSize: 7
- fontSize: regularSize
- elide: Text.ElideRight
- maximumLineCount: 3
- wrapMode: Text.WordWrap
- text: ActivityInfoTree.menuTree[index].description
- }
}
ParticleSystemStarLoader {
id: particles
anchors.fill: activityBackground
}
MouseArea {
anchors.fill: activityBackground
onClicked: selectCurrentItem()
}
Image {
source: activity.url + (favorite ? "all.svg" : "all_disabled.svg");
anchors {
top: parent.top
right: parent.right
rightMargin: 4 * ApplicationInfo.ratio
}
sourceSize.width: iconWidth * 0.25
visible: ApplicationSettings.sectionVisible
MouseArea {
anchors.fill: parent
onClicked: favorite = !favorite
}
}
DialogChooseLevel {
id: dialogChooseLevel
displayDatasetAtStart: hasDataset
currentActivity: ActivityInfoTree.menuTree[index]
inMenu: true
onClose: {
home()
}
onSaveData: {
currentLevels = dialogChooseLevel.chosenLevels
ApplicationSettings.setCurrentLevels(name, currentLevels)
}
onStartActivity: {
clickMode = "play"
// immediately pop the Dialog to load the activity
// if we don't do it immediately the page is busy
// and it does not load the activity
pageView.pop({immediate: true})
selectCurrentItem()
}
}
function selectCurrentItem() {
if(pageView.busy || !delegateItem.enabled)
return
if(clickMode == "play") {
particles.burst(50)
ActivityInfoTree.currentActivity = ActivityInfoTree.menuTree[index]
activityLoader.setSource("qrc:/gcompris/src/activities/" + ActivityInfoTree.currentActivity.name,
{
'menu': activity,
'activityInfo': ActivityInfoTree.currentActivity,
'levelFolder': currentLevels
})
if (activityLoader.status == Loader.Ready) loadActivity()
}
else {
displayDialog(dialogChooseLevel);
}
}
}
highlight: Rectangle {
width: activityCellWidth - activitiesGrid.spacing
height: activityCellHeight - activitiesGrid.spacing
color: "#AAFFFFFF"
border.width: 3
border.color: "black"
visible: background.keyboardMode
Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } }
Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } }
}
Rectangle {
id: activitiesMask
visible: false
anchors.fill: activitiesGrid
gradient: Gradient {
GradientStop { position: 0.0; color: "#FFFFFFFF" }
GradientStop { position: 0.92; color: "#FFFFFFFF" }
GradientStop { position: 0.96; color: "#00FFFFFF"}
}
}
layer.enabled: ApplicationInfo.useOpenGL
layer.effect: OpacityMask {
id: activitiesOpacity
source: activitiesGrid
maskSource: activitiesMask
anchors.fill: activitiesGrid
}
}
// The scroll buttons
GCButtonScroll {
visible: !ApplicationInfo.useOpenGL
anchors.right: parent.right
anchors.rightMargin: 5 * ApplicationInfo.ratio
anchors.bottom: activitiesGrid.bottom
anchors.bottomMargin: 30 * ApplicationInfo.ratio
onUp: activitiesGrid.flick(0, 1127)
onDown: activitiesGrid.flick(0, -1127)
upVisible: activitiesGrid.visibleArea.yPosition <= 0 ? false : true
downVisible: activitiesGrid.visibleArea.yPosition >= 1 ? false : true
}
Rectangle {
id: categories
width: horizontal ? parent.width : parent.width - (section.width+10)
height: searchTextField.height
visible: sections[activity.currentTag] === "search"
anchors {
top: horizontal ? section.bottom : categoriesGrid.top
left: horizontal ? undefined : section.right
}
}
Rectangle {
id: searchBar
width: horizontal ? parent.width/2 : parent.width - (section.width+10)
- height: searchTextField.height
+ height: horizontal ? sectionCellHeight * 0.5 : sectionCellHeight
visible: activity.currentTag === "search"
anchors {
top: horizontal ? section.bottom : parent.top
left: horizontal ? undefined : section.right
}
anchors.topMargin: horizontal ? 0 : 4
anchors.bottomMargin: horizontal ? 0 : 4
anchors.horizontalCenter: horizontal ? parent.horizontalCenter : undefined
opacity: 0.5
radius: 10
border.width: 2
border.color: "black"
gradient: Gradient {
GradientStop { position: 0.3; color: "#000" }
GradientStop { position: 0.9; color: "#666" }
GradientStop { position: 1.0; color: "#AAA" }
}
Connections {
// On mobile with GCompris' virtual keyboard activated:
// Force invisibility of Androids virtual keyboard:
target: (ApplicationInfo.isMobile && activity.currentTag === "search"
&& ApplicationSettings.isVirtualKeyboard) ? Qt.inputMethod : null
onVisibleChanged: {
if (ApplicationSettings.isVirtualKeyboard && visible)
Qt.inputMethod.hide();
}
onAnimatingChanged: {
// note: seems to be never fired!
if (ApplicationSettings.isVirtualKeyboard && Qt.inputMethod.visible)
Qt.inputMethod.hide();
}
}
Connections {
target: activity
onCurrentTagChanged: {
if (activity.currentTag === 'search') {
searchTextField.focus = true;
} else
activity.focus = true;
}
}
TextField {
id: searchTextField
width: parent.width
- visible: activity.currentTag === "search"
+ height: parent.height
textColor: "black"
- font.pointSize: 16
+ font.pointSize: 32
font.bold: true
horizontalAlignment: TextInput.AlignHCenter
verticalAlignment: TextInput.AlignVCenter
font.family: GCSingletonFontLoader.fontLoader.name
inputMethodHints: Qt.ImhNoPredictiveText
// Note: we give focus to the textfield also in case
// isMobile && !ApplicationSettings.isVirtualKeyboard
// in conjunction with auto-hiding the inputMethod to always get
// an input-cursor:
activeFocusOnPress: true //ApplicationInfo.isMobile ? !ApplicationSettings.isVirtualKeyboard : true
Keys.onReturnPressed: {
if (ApplicationInfo.isMobile && !ApplicationSettings.isVirtualKeyboard)
Qt.inputMethod.hide();
activity.focus = true;
}
onEditingFinished: {
if (ApplicationInfo.isMobile && !ApplicationSettings.isVirtualKeyboard)
Qt.inputMethod.hide();
activity.focus = true;
}
style: TextFieldStyle {
placeholderTextColor: "black"
}
placeholderText: qsTr("Search specific activities")
onTextChanged: ActivityInfoTree.filterBySearch(searchTextField.text);
}
}
Rectangle {
id: activityConfigTextBar
width: horizontal ? parent.width/2 : parent.width - (section.width+10)
height: activitySettingsLabel.height
visible: clickMode === "activityConfig"
anchors {
bottom: bar.top
bottomMargin: height * 0.3
left: horizontal ? undefined : section.right
}
anchors.horizontalCenter: horizontal ? parent.horizontalCenter : undefined
radius: 10
border.width: height * 0.05
border.color: "#8b66b2"
color: "#eeeeee"
GCText {
id: activitySettingsLabel
text: qsTr("Activity Settings")
visible: parent.visible
width: parent.width
height: paintedHeight
anchors.verticalCenter: parent.verticalCenter
horizontalAlignment: Text.AlignHCenter
color: "#232323"
}
}
VirtualKeyboard {
id: keyboard
readonly property var letter: ActivityInfoTree.characters
width: parent.width
visible: activity.currentTag === "search" && ApplicationSettings.isVirtualKeyboard
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
onKeypress: {
if(text == keyboard.backspace) {
searchTextField.text = searchTextField.text.slice(0, -1);
}
else if(text == keyboard.space) {
searchTextField.text = searchTextField.text.concat(" ");
}
else {
searchTextField.text = searchTextField.text.concat(text);
}
}
function populate() {
var tmplayout = [];
var row = 0;
var offset = 0;
var cols;
while(offset < letter.length-1) {
if(letter.length <= 100) {
cols = Math.ceil((letter.length-offset) / (3 - row));
}
else {
cols = background.horizontal ? (Math.ceil((letter.length-offset) / (15 - row)))
:(Math.ceil((letter.length-offset) / (22 - row)))
if(row == 0) {
tmplayout[row] = new Array();
tmplayout[row].push({ label: keyboard.backspace });
tmplayout[row].push({ label: keyboard.space });
row ++;
}
}
tmplayout[row] = new Array();
for (var j = 0; j < cols; j++)
tmplayout[row][j] = { label: letter[j+offset] };
offset += j;
row ++;
}
if(letter.length <= 100) {
tmplayout[0].push({ label: keyboard.space });
tmplayout[row-1].push({ label: keyboard.backspace });
}
keyboard.layout = tmplayout
}
}
Bar {
id: bar
// No exit button on mobile, UI Guidelines prohibits it
content: BarEnumContent {
value: help | config | activityConfig | about | (ApplicationInfo.isMobile ? 0 : exit)
}
anchors.bottom: keyboard.visible ? keyboard.top : parent.bottom
onAboutClicked: {
searchTextField.focus = false
displayDialog(dialogAbout)
}
onHelpClicked: {
searchTextField.focus = false
displayDialog(dialogHelp)
}
onActivityConfigClicked: {
if(clickMode == "play") {
clickMode = "activityConfig"
}
else {
clickMode = "play"
}
}
onConfigClicked: {
searchTextField.focus = false
dialogActivityConfig.active = true
dialogActivityConfig.loader.item.loadFromConfig()
displayDialog(dialogActivityConfig)
}
}
DialogAbout {
id: dialogAbout
onClose: home()
}
DialogHelp {
id: dialogHelp
onClose: home()
activityInfo: ActivityInfoTree.rootMenu
}
DialogActivityConfig {
id: dialogActivityConfig
currentActivity: activity
content: Component {
ConfigurationItem {
id: configItem
width: dialogActivityConfig.width - 50 * ApplicationInfo.ratio
}
}
onSaveData: {
- dialogActivityConfig.configItem.save();
+ dialogActivityConfig.configItem.save()
}
onClose: {
if(activity.currentTag != "search") {
ActivityInfoTree.filterByTag(activity.currentTag, currentCategory)
ActivityInfoTree.filterLockedActivities()
ActivityInfoTree.filterEnabledActivities()
} else
ActivityInfoTree.filterBySearch(searchTextField.text);
+
+ backgroundMusic.clearQueue()
+ /**
+ * 1. If the current playing background music is in new filtered playlist too, continue playing it and append all the next filtered musics to backgroundMusic element.
+ * 2. Else, stop the current music, find the filtered music which comes just after it, and append all the further musics after it.
+ */
+ var backgroundMusicSource = String(backgroundMusic.source)
+ var backgroundMusicName = dialogActivityConfig.configItem.extractMusicNameFromPath(backgroundMusicSource) + backgroundMusicSource.slice(backgroundMusicSource.lastIndexOf('.'), backgroundMusicSource.length)
+ var nextMusicIndex = dialogActivityConfig.configItem.filteredBackgroundMusic.indexOf(backgroundMusicName)
+ if(nextMusicIndex != -1) {
+ nextMusicIndex++
+ while(nextMusicIndex < dialogActivityConfig.configItem.filteredBackgroundMusic.length)
+ backgroundMusic.append(ApplicationInfo.getAudioFilePath("backgroundMusic/" + dialogActivityConfig.configItem.filteredBackgroundMusic[nextMusicIndex++]))
+ }
+ else {
+ nextMusicIndex = dialogActivityConfig.configItem.allBackgroundMusic.indexOf(backgroundMusicName) + 1
+ while(nextMusicIndex < dialogActivityConfig.configItem.allBackgroundMusic.length) {
+ if(dialogActivityConfig.configItem.filteredBackgroundMusic.indexOf(dialogActivityConfig.configItem.allBackgroundMusic[nextMusicIndex]) != -1) {
+ nextMusicIndex = dialogActivityConfig.configItem.filteredBackgroundMusic.indexOf(dialogActivityConfig.configItem.allBackgroundMusic[nextMusicIndex])
+ break
+ }
+ nextMusicIndex++
+ }
+
+ while(nextMusicIndex < dialogActivityConfig.configItem.filteredBackgroundMusic.length)
+ backgroundMusic.append(ApplicationInfo.getAudioFilePath("backgroundMusic/" + dialogActivityConfig.configItem.filteredBackgroundMusic[nextMusicIndex++]))
+ backgroundMusic.nextAudio()
+ }
home()
}
+
+ BackgroundMusicList {
+ id: backgroundMusicList
+ onClose: {
+ visible = false
+ dialogActivityConfig.configItem.visible = true
+ }
+ }
}
}
}
diff --git a/src/activities/menu/resource/README b/src/activities/menu/resource/README
index 29a794aa9..0837eaba8 100644
--- a/src/activities/menu/resource/README
+++ b/src/activities/menu/resource/README
@@ -1,22 +1,35 @@
Copyright: Iyo, 2013
License: Public domain
Files:
lock.svg
-Copyright: Timothée Giet, 2015-2016
+Copyright: Timothée Giet, 2015-2019
License: CC-BY-SA 4.0
Files:
all_disabled.svg
all.svg
background.svg
+category-arithmetic.svg
+category-experiment.svg
+category-arts.svg
+category-geography.svg
+category-history.svg
+category-letters.svg
+category-logic.svg
+category-measures.svg
+category-music.svg
+category-numeration.svg
+category-vocabulary.svg
+category-words.svg
computer.svg
discovery.svg
experience.svg
fun.svg
math.svg
new.svg
puzzle.svg
reading.svg
search-icon.svg
strategy.svg
+
diff --git a/src/activities/menu/resource/category-arithmetic.svg b/src/activities/menu/resource/category-arithmetic.svg
new file mode 100644
index 000000000..06afd6e22
--- /dev/null
+++ b/src/activities/menu/resource/category-arithmetic.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-arithmetic.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16.000001"
+ inkscape:cx="8.2454787"
+ inkscape:cy="18.410014"
+ inkscape:document-units="px"
+ inkscape:current-layer="text843"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <g
+ aria-label="123"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ id="text843">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 16,0 A 16,16 0 0 0 0,16 16,16 0 0 0 16,32 16,16 0 0 0 32,16 16,16 0 0 0 16,0 Z M 7.4648438,10.138672 V 21.621094 L 4.6796875,21.861328 V 14.326172 L 2.9863281,15.195312 2,13.498047 Z m 18.1464842,0.300781 h 0.05664 c 0.692273,0 1.335067,0.133464 1.929687,0.400391 0.596787,0.266926 1.081812,0.654516 1.455078,1.160156 0.36458,0.507813 0.56467,1.116532 0.601563,1.826172 v 0.158203 c 0,0.551213 -0.159296,1.169702 -0.480469,1.855469 -0.3559,0.763886 -0.787315,1.421436 -1.292969,1.972656 l -1.11914,1.240234 H 30 l -0.654297,2.507813 h -7.837891 l 4.039063,-4.841797 c 0.878907,-1.137153 1.318359,-1.944228 1.318359,-2.423828 v -0.08203 c -0.05207,-0.47092 -0.203538,-0.820742 -0.453125,-1.050782 -0.230033,-0.21484 -0.509983,-0.322265 -0.839843,-0.322265 h -0.07813 c -0.3559,0.0087 -0.648653,0.137138 -0.88086,0.386718 -0.230033,0.249567 -0.353734,0.552304 -0.371093,0.908204 v 0.05273 c 0,0.488287 0.309027,0.888672 0.929687,1.201172 l -1.558594,2.050781 c -0.0087,-0.0087 -0.114352,-0.0805 -0.318359,-0.212891 -0.203993,-0.134546 -0.399311,-0.276041 -0.585938,-0.425781 -0.729166,-0.685766 -1.09375,-1.561413 -1.09375,-2.626953 v -0.214844 c 0.02607,-0.674913 0.216393,-1.28863 0.572266,-1.839843 0.347227,-0.54254 0.830519,-0.958987 1.451172,-1.251953 0.596787,-0.284287 1.254343,-0.427735 1.972656,-0.427735 z M 14,12 h 2 v 3 h 3 v 2 h -3 v 3 h -2 v -3 h -3 v -2 h 3 z"
+ transform="translate(421.71429,515.79074)"
+ id="path823"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-arts.svg b/src/activities/menu/resource/category-arts.svg
new file mode 100644
index 000000000..cc169064d
--- /dev/null
+++ b/src/activities/menu/resource/category-arts.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-finearts.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313709"
+ inkscape:cx="15.243769"
+ inkscape:cy="5.7225149"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <path
+ inkscape:connector-curvature="0"
+ d="m 444.91019,538.69631 c -0.13104,3.88142 3.46818,3.55092 4.46333,5.29243 0.43655,0.76396 -0.4221,1.73998 -1.21723,1.79328 1.57931,0.52139 3.11426,-2.48819 2.4549,-4.19328 -0.59038,-1.52673 -1.80662,-2.39617 -3.25903,-3.01639 -0.60015,-0.25628 -1.16643,-0.32213 -1.77397,-0.54405 z"
+ id="path3150-0"
+ style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.03936233"
+ mask="none" />
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 424.75763,517.83668 a 14.5,2 45 0 0 8.83884,11.66726 14.5,2 45 0 0 10.44778,8.6441 l 1.02751,-1.02751 a 14.5,2 45 0 0 -8.64686,-10.44502 14.5,2 45 0 0 -11.66727,-8.83883 z"
+ id="path1013"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-experiment.svg b/src/activities/menu/resource/category-experiment.svg
new file mode 100644
index 000000000..412e66b70
--- /dev/null
+++ b/src/activities/menu/resource/category-experiment.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-experiment.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6568545"
+ inkscape:cx="16.682978"
+ inkscape:cy="11.660015"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 16,2 a 4,2 0 0 0 -4,2 4,2 0 0 0 4,2 4,2 0 0 0 4,-2 4,2 0 0 0 -4,-2 z m 0,0.5585938 a 3,1 0 0 1 3,1 3,1 0 0 1 -3,1 3,1 0 0 1 -3,-1 3,1 0 0 1 3,-1 z"
+ transform="translate(421.71429,515.79074)"
+ id="path849"
+ inkscape:connector-curvature="0" />
+ <rect
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.95742583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect851"
+ width="6"
+ height="10.99997"
+ x="434.71429"
+ y="520.79071" />
+ <path
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 437.71429,523.79074 -11,19 c 0,5 22,5 22,0 z m -5.29492,12 c 1.29492,2 9.29492,2 10.58984,0 l 3.70508,7 c 0,2.99997 -18,3 -18,0 z"
+ id="path853"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccc" />
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-geography.svg b/src/activities/menu/resource/category-geography.svg
new file mode 100644
index 000000000..f3f39d11e
--- /dev/null
+++ b/src/activities/menu/resource/category-geography.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-geography.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4290"
+ id="linearGradient4161"
+ x1="16.000011"
+ y1="29.999973"
+ x2="16.000011"
+ y2="1.999974"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.85714251,0,0,0.85714251,386.85715,516.08372)" />
+ <linearGradient
+ id="linearGradient4290"
+ inkscape:collect="always">
+ <stop
+ id="stop4292"
+ offset="0"
+ style="stop-color:#7cbaf8;stop-opacity:1" />
+ <stop
+ id="stop4294"
+ offset="1"
+ style="stop-color:#f4fcff;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4290"
+ id="linearGradient1126"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.85714251,0,0,0.85714251,386.85715,516.08372)"
+ x1="16.000011"
+ y1="29.999973"
+ x2="16.000011"
+ y2="1.999974" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313709"
+ inkscape:cx="15.243769"
+ inkscape:cy="5.7225149"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 16,2 A 13.999998,14 0 0 0 2,16 13.999998,14 0 0 0 16,30 13.999998,14 0 0 0 30,16 13.999998,14 0 0 0 16,2 Z m -0.166016,2.0078125 c 0.18099,0.001 0.364022,-0.00413 0.544922,0.00977 0.06688,0.33922 1.148106,0.675935 0.853516,1.265625 -0.69375,0.68584 0.353283,0.6055606 0.189453,1.3066407 -0.37314,0.1222999 -2.069399,-0.05971 -0.943359,-0.6875 0.82331,-0.66395 -0.263467,-0.2010688 -0.654297,-0.1054688 -0.65993,-0.15836 -0.383801,0.195955 -0.519531,0.296875 -0.18669,-0.63931 -1.603795,0.00386 -0.521485,-0.023437 -0.36468,0.42996 0.0021,1.271515 0.626953,0.671875 0.43309,0.39873 -1.081197,0.5141794 -1.404297,0.8183594 0.23786,-0.69223 -0.43273,-0.1982057 -1.02539,-0.041016 -0.47256,0.72938 -1.496155,0.933855 -2.109375,1.546875 0.05883,0.6959101 -0.799482,1.0399032 -1.4199221,1.4140632 -1.24312,0.06757 0.1140656,2.133611 -1.0214844,1.550781 -0.05537,-0.61574 -0.3913187,-0.859531 -1.0742187,-0.894531 -0.8319701,0.4626 -1.7660701,-0.08924 -2.5625,0.58789 C 5.2386688,10.550199 5.86958,9.4462269 6.65625,8.4667969 7.37917,7.8158969 8.1643388,6.212005 9.2617188,6.765625 10.359519,7.016955 9.5981481,5.7006456 8.9863281,6.3222656 c 0.06761,-0.12814 2.0274579,-1.5254612 2.4863279,-1.2695312 0.09332,1.11579 0.680033,-0.4328282 1.033203,-0.4238282 1.02652,-0.4701 2.192985,-0.5952937 3.328125,-0.6210937 z m -5.708984,2.875 C 9.78035,6.8081325 9.7613288,7.4985094 9.9804688,7.6308594 10.362729,7.2549994 11.09988,6.9977825 10.125,6.8828125 Z m -0.6582031,0.044922 c -0.46299,8.8e-4 -0.9489844,0.6425031 -0.9589844,1.0644531 0.35252,-0.05886 0.8680844,-0.9249231 0.9589844,-1.0644531 z m 1.7343751,0.5273437 c -1.13055,0.03262 0.51991,0.3237 0,0 z M 10.251953,7.8125 10.033203,7.855469 c -1.2225399,0.23414 0.5486,0.3210612 0.21875,-0.042969 z M 24.96875,8.0292969 c 0.39141,0.4411 0.755475,0.9083237 1.078125,1.4023437 -0.60535,7.9e-4 -0.160191,0.5787764 0.230469,0.3789063 1.37164,2.2682001 1.974317,5.0028951 1.623047,7.6347651 -0.53184,0.470711 -1.683438,0.628566 -2.523438,0.572266 -1.33528,0.50537 -1.896131,-1.177431 -2.744141,-1.832031 -0.68817,-0.74605 0.507877,-1.711119 -0.121093,-2.474609 0.23171,-0.96482 0.9964,-1.84303 1.875,-2.34375 -0.11136,-0.92868 1.338967,-1.098602 1.091797,-1.9511724 -0.8348,0.02339 -0.699606,-0.7795087 -0.509766,-1.3867187 z M 6.6523438,13.527344 c 0.49734,0.45668 -1.1695844,1.787384 0.1035156,1.558594 1.62514,-0.36477 -0.1468763,1.72164 1.2148437,1.90039 0.52259,-0.52997 1.1181619,0.489177 1.4511719,-0.220703 0.04576,-0.37062 1.379882,-0.951659 1.138672,-0.480469 0.53445,-0.31565 1.365306,0.64874 2.041015,0.1875 0.880511,-0.04878 0.965285,0.843317 1.828126,1.285156 1.553869,-0.43332 1.420405,1.59883 2.478515,1.81836 0.78753,0.59576 1.831442,0.320502 2.576172,1.013672 1.43279,0.2114 0.607743,1.642485 -0.0293,2.296875 -0.33441,0.86522 0.0629,2.659152 -1.279297,2.794922 -1.39435,0.16005 -0.803926,1.590975 -1.660156,2.291015 -1.67492,0.10652 -3.366834,-0.197407 -4.927734,-0.804687 -0.697,-0.57903 0.05101,-2.04577 -0.576172,-2.84961 C 9.6966987,23.795829 9.025105,22.695128 8.421875,21.455078 7.529425,21.001558 8.3455856,20.357148 7.9785156,19.798828 8.4062356,18.917388 9.62572,17.883461 8.5,16.962891 c -0.36163,0.83175 -1.0424831,0.09316 -1.5644531,-0.236329 -0.27131,-1.066289 -1.6545232,-1.039257 -2.3769531,-1.742187 -0.94028,0.86313 -0.3527994,-1.872331 -0.1621094,-0.769531 1.01263,0.79861 1.3750593,-0.7299 2.2558594,-0.6875 z m 3.9160152,3.101562 c -0.40438,0.20022 0.35543,0.36909 0,0 z"
+ transform="translate(421.71429,515.79074)"
+ id="path1099"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-history.svg b/src/activities/menu/resource/category-history.svg
new file mode 100644
index 000000000..16f82c3f9
--- /dev/null
+++ b/src/activities/menu/resource/category-history.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-history.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627417"
+ inkscape:cx="5.9292984"
+ inkscape:cy="16.792537"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <path
+ style="color:#4d4d4d;display:inline;overflow:visible;visibility:visible;fill:currentColor;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.5;marker:none;enable-background:accumulate"
+ d="M 18,4 C 11.71028,4 6.5602551,8.841791 6.0507812,15 H 2 l 5,6 5,-6 H 8.0488281 C 8.551099,9.9472414 12.815053,6 18,6 c 5.52285,0 10,4.47715 10,10 0,5.52285 -4.47715,10 -10,10 -2.82708,0 -5.374549,-1.178433 -7.193359,-3.064453 L 9.3925781,24.349609 C 11.573488,26.597449 14.62066,28 18,28 24.62742,28 30,22.62742 30,16 30,9.37258 24.62742,4 18,4 Z m -1,4 v 7 2 h 7 V 15 H 19 V 8 Z"
+ transform="translate(421.71429,515.79074)"
+ id="path4876"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-letters.svg b/src/activities/menu/resource/category-letters.svg
new file mode 100644
index 000000000..144eab130
--- /dev/null
+++ b/src/activities/menu/resource/category-letters.svg
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-letters.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16.000001"
+ inkscape:cx="14.495478"
+ inkscape:cy="17.222514"
+ inkscape:document-units="px"
+ inkscape:current-layer="text843"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <g
+ aria-label="123"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ id="text843">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 16,0 C 7.163444,0 0,7.163444 0,16 0,24.836556 7.163444,32 16,32 24.836556,32 32,24.836556 32,16 32,7.163444 24.836556,0 16,0 Z M 6.703125,11.134766 11.416016,20.361328 9.2109375,20.841797 8.2714844,18.880859 H 5.0390625 L 4.2089844,20.865234 2,20.361328 Z m 20.960937,0.353515 h 0.458985 c 0.512153,0 1.012586,0.08095 1.503906,0.244141 l 0.351563,2.443359 c -0.4757,-0.434026 -1.030383,-0.65039 -1.664063,-0.65039 -0.73264,0 -1.347443,0.247827 -1.845703,0.746093 -0.475693,0.477427 -0.712891,1.06076 -0.712891,1.75 v 0.107422 c 0.04167,0.725694 0.325743,1.304035 0.853516,1.736328 0.4757,0.406247 1.014974,0.609375 1.619141,0.609375 0.05727,0 0.114561,-0.0028 0.171875,-0.0098 C 29.018444,18.421444 29.55208,18.20508 30,17.814453 l -0.330078,2.355469 c -0.390627,0.17882 -0.760415,0.282767 -1.109375,0.310547 -0.184027,0.0208 -0.366102,0.03125 -0.544922,0.03125 -0.48958,0 -0.966148,-0.0753 -1.429687,-0.22461 -0.625,-0.197913 -1.179683,-0.513232 -1.664063,-0.947265 -0.482633,-0.42708 -0.852428,-0.929473 -1.109375,-1.50586 -0.262153,-0.567713 -0.392578,-1.167101 -0.392578,-1.800781 0,-0.583333 0.106772,-1.14562 0.320312,-1.685547 0.21354,-0.539933 0.510845,-1.019313 0.894532,-1.439453 0.376733,-0.413193 0.829428,-0.748699 1.355468,-1.003906 0.52604,-0.25 1.083548,-0.388236 1.673828,-0.416016 z m -13.794921,0.21875 h 2.560547 c 1.05208,0 1.87261,0.135197 2.46289,0.404297 0.583333,0.270833 0.908423,0.833333 0.972656,1.6875 0.0069,0.06247 0.0098,0.122361 0.0098,0.179688 0,0.342013 -0.07053,0.636505 -0.212891,0.884765 -0.17014,0.298614 -0.341799,0.514978 -0.513671,0.650391 -0.177088,0.142367 -0.312284,0.235677 -0.404297,0.277344 0.0208,0.0156 0.148405,0.09112 0.382812,0.226562 0.227433,0.140627 0.445744,0.341582 0.652344,0.605469 0.199653,0.270833 0.31207,0.606339 0.339844,1.003906 0.0069,0.08507 0.01172,0.16884 0.01172,0.253906 0,0.45486 -0.09614,0.850474 -0.287109,1.185547 -0.236113,0.397567 -0.569666,0.69965 -1.001953,0.90625 -0.440973,0.21354 -0.932944,0.320313 -1.474609,0.320313 l -3.498047,-0.02148 z m 2.144531,1.654297 v 1.726563 h 0.542969 c 0.298613,0 0.55881,-0.08572 0.779297,-0.25586 0.185759,-0.149306 0.279296,-0.349609 0.279296,-0.599609 v -0.103516 c -0.02953,-0.31424 -0.136305,-0.520187 -0.320312,-0.61914 -0.192707,-0.09896 -0.445313,-0.148438 -0.757813,-0.148438 z m -9.3750001,1.773438 -0.8515625,1.929687 h 1.7265625 z m 9.3750001,1.617187 v 1.791016 h 0.628906 c 0.440973,0 0.761072,-0.07813 0.958984,-0.234375 0.178821,-0.142367 0.267579,-0.348094 0.267579,-0.617188 v -0.06445 c -0.0069,-0.31944 -0.116524,-0.548174 -0.330079,-0.683594 -0.220486,-0.128473 -0.548395,-0.191406 -0.982421,-0.191406 z"
+ transform="translate(421.71429,515.79074)"
+ id="path825"
+ inkscape:connector-curvature="0" />
+ <g
+ aria-label="ABC"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:Kabel;-inkscape-font-specification:Kabel;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ id="text841" />
+ </g>
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-logic.svg b/src/activities/menu/resource/category-logic.svg
new file mode 100644
index 000000000..96951d3ad
--- /dev/null
+++ b/src/activities/menu/resource/category-logic.svg
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-logic.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8"
+ inkscape:cx="5.9292984"
+ inkscape:cy="16.792537"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.70959216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 446.50778,518.31295 -0.98959,1.27867 -0.0202,0.0854 -0.15532,1.33807 -1.6584,0.13112 -0.36388,-1.29715 -0.0335,-0.081 -1.17834,-1.10706 -1.01994,0.52009 0.20416,1.60383 0.0462,0.0748 0.83602,1.05602 -1.07978,1.26547 -1.17439,-0.66002 -0.0814,-0.0339 -1.61571,0.0506 -0.35333,1.08902 1.27823,0.98959 0.0854,0.0202 1.33807,0.15532 0.13112,1.65884 -1.29715,0.36344 -0.081,0.0334 -1.10706,1.17835 0.52009,1.01994 1.60383,-0.20416 0.0748,-0.0458 1.05602,-0.83646 1.26546,1.08022 -0.66001,1.17439 -0.0334,0.081 0.0502,1.61571 1.08902,0.35377 0.98959,-1.27867 0.0207,-0.0854 0.15532,-1.33807 1.65839,-0.13112 0.36389,1.29715 0.0334,0.081 1.17835,1.10706 1.01994,-0.52009 -0.20416,-1.60384 -0.0462,-0.0748 -0.83601,-1.05602 1.07978,-1.26547 1.17438,0.66002 0.081,0.0334 1.61616,-0.0502 0.35333,-1.08902 -1.27867,-0.98959 -0.0854,-0.0202 -1.33807,-0.15576 -0.13112,-1.6584 1.29714,-0.36388 0.081,-0.0334 1.1075,-1.17791 -0.52053,-1.02038 -1.60384,0.2046 -0.0744,0.0458 -1.05646,0.83646 -1.26503,-1.08023 0.65958,-1.17439 0.0339,-0.081 -0.0506,-1.61615 -1.08903,-0.35333 z m -1.59768,4.72394 a 2.2528475,2.2528475 0 0 1 1.94264,1.22851 2.2528475,2.2528475 0 0 1 -0.98342,3.03034 2.2528475,2.2528475 0 0 1 -3.03034,-0.98342 2.2528475,2.2528475 0 0 1 0.98342,-3.03034 2.2528475,2.2528475 0 0 1 1.0877,-0.24509 z"
+ id="path4776-3" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.70959216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 444.12401,530.81429 -0.9887,1.2791 -0.0202,0.0854 -0.15401,1.3385 -1.65839,0.13245 -0.36521,-1.29671 -0.0334,-0.081 -1.17922,-1.10619 -1.0195,0.52098 0.20548,1.60383 0.0462,0.0748 0.83734,1.05514 -1.0789,1.26635 -1.17483,-0.65869 -0.0814,-0.0339 -1.61571,0.0519 -0.35244,1.08946 1.2791,0.98826 0.0854,0.0202 1.3385,0.15445 0.13245,1.65839 -1.29671,0.36477 -0.081,0.0334 -1.10618,1.17966 0.52097,1.0195 1.60383,-0.20592 0.0748,-0.0462 1.05513,-0.8369 1.26635,1.0789 -0.65868,1.17483 -0.0339,0.081 0.0519,1.61616 1.08946,0.35244 0.9887,-1.27955 0.0198,-0.0854 0.15445,-1.33806 1.65839,-0.13245 0.36477,1.29627 0.0339,0.0814 1.17923,1.10575 1.0195,-0.52098 -0.20593,-1.60339 -0.0458,-0.0748 -0.83734,-1.05558 1.0789,-1.26635 1.17483,0.65913 0.081,0.0334 1.61615,-0.0515 0.35245,-1.08946 -1.27954,-0.9887 -0.0854,-0.0202 -1.33806,-0.154 -0.13245,-1.6584 1.29671,-0.3652 0.081,-0.0335 1.1062,-1.17922 -0.52142,-1.0195 -1.60339,0.20548 -0.0748,0.0462 -1.05514,0.83734 -1.26679,-1.0789 0.65913,-1.17527 0.0334,-0.081 -0.0515,-1.61571 -1.08946,-0.35245 z m -1.56115,4.72614 a 2.2528475,2.2528475 0 0 1 0.59885,0.10736 2.2528475,2.2528475 0 0 1 1.44983,2.83718 2.2528475,2.2528475 0 0 1 -2.83674,1.44983 2.2528475,2.2528475 0 0 1 -1.45027,-2.83674 2.2528475,2.2528475 0 0 1 2.23833,-1.55763 z"
+ id="path4776" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.70959216;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="m 432.38639,525.53524 -0.93458,1.31914 -0.0167,0.0862 -0.0986,1.34335 -1.65136,0.20153 -0.41844,-1.28043 -0.037,-0.0796 -1.2241,-1.05646 -0.99706,0.56321 0.27192,1.59371 0.0493,0.0726 0.88002,1.0195 -1.02522,1.31034 -1.20123,-0.60985 -0.0823,-0.0299 -1.61263,0.1188 -0.30669,1.1031 1.31915,0.93458 0.0862,0.0163 1.34335,0.099 0.20108,1.65136 -1.28042,0.41845 -0.0796,0.0365 -1.05603,1.22411 0.56277,0.99706 1.59372,-0.27192 0.073,-0.0488 1.0195,-0.88046 1.30991,1.02566 -0.60941,1.20122 -0.0304,0.0823 0.1188,1.61219 1.1031,0.30713 0.93458,-1.31915 0.0167,-0.0862 0.0986,-1.34335 1.65136,-0.20153 0.41844,1.28043 0.037,0.0796 1.22411,1.05647 0.99706,-0.56322 -0.27192,-1.59371 -0.0493,-0.0726 -0.88001,-1.0195 1.02522,-1.31035 1.20122,0.60941 0.0827,0.0304 1.6122,-0.1188 0.30713,-1.1031 -1.31959,-0.93458 -0.0858,-0.0167 -1.34379,-0.0986 -0.20109,-1.65136 1.28043,-0.41845 0.0796,-0.037 1.05602,-1.2241 -0.56277,-0.99706 -1.59371,0.27236 -0.0726,0.0488 -1.01994,0.88046 -1.30991,-1.02566 0.60941,-1.20122 0.0304,-0.0823 -0.1188,-1.61219 -1.10311,-0.30713 z m -1.36359,4.78686 a 2.2528475,2.2528475 0 0 1 0.60281,0.0827 2.2528475,2.2528475 0 0 1 1.56643,2.77426 2.2528475,2.2528475 0 0 1 -2.77469,1.56643 2.2528475,2.2528475 0 0 1 -1.566,-2.77426 2.2528475,2.2528475 0 0 1 2.17145,-1.64915 z"
+ id="path4776-6" />
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-measures.svg b/src/activities/menu/resource/category-measures.svg
new file mode 100644
index 000000000..a13382556
--- /dev/null
+++ b/src/activities/menu/resource/category-measures.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-measures.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="22.627418"
+ inkscape:cx="19.557978"
+ inkscape:cy="16.876838"
+ inkscape:document-units="px"
+ inkscape:current-layer="text843"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <g
+ aria-label="123"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ id="text843">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.92393714;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 6.453125,0.796875 -5.65625,5.65625 24.75,24.75 5.65625,-5.65625 z M 6.4648438,2.2226562 7.1601562,2.9179688 4.3320312,5.7460938 3.6367188,5.0507812 Z M 7.8691406,3.625 8.5761719,4.3320312 7.8691406,5.0390625 7.1601562,4.3320312 Z M 9.2832031,5.0390625 9.9902344,5.7460938 9.2832031,6.453125 8.5761719,5.7460938 Z M 10.697266,6.453125 11.404297,7.1621094 10.697266,7.8691406 9.9902344,7.1621094 Z m 1.414062,1.4160156 0.707031,0.7070313 -2.121093,2.1210941 -0.7070316,-0.7070316 z m 1.414063,1.4140625 0.707031,0.7070313 -0.707031,0.7070316 -0.707032,-0.7070316 z m 1.414062,1.4140629 0.707031,0.707031 -0.707031,0.707031 -0.707031,-0.707031 z m 1.414063,1.414062 0.707031,0.707031 -0.707031,0.707032 -0.707032,-0.707032 z m 1.414062,1.414063 0.707031,0.707031 -2.828125,2.828125 -0.707031,-0.707031 z m 1.414063,1.414062 0.707031,0.707031 -0.707031,0.707032 -0.707032,-0.707032 z m 1.414062,1.414063 0.707031,0.707031 -0.707031,0.707031 -0.707031,-0.707031 z m 1.414063,1.414062 0.707031,0.707031 -0.707031,0.707032 -0.707032,-0.707032 z m 1.414062,1.414063 0.707031,0.707031 -2.121093,2.121094 -0.707032,-0.707032 z m 1.414063,1.414062 0.707031,0.707031 -0.707031,0.707032 -0.707032,-0.707032 z m 1.416015,1.414063 0.707032,0.707031 -0.707032,0.707031 -0.708984,-0.707031 z m 1.414063,1.414062 0.707031,0.707031 -0.707031,0.707032 -0.707031,-0.707032 z m 1.414062,1.414063 0.707031,0.708984 -2.828124,2.828125 -0.707032,-0.707031 z"
+ transform="translate(421.71429,515.79074)"
+ id="rect911"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-music.svg b/src/activities/menu/resource/category-music.svg
new file mode 100644
index 000000000..2d702258d
--- /dev/null
+++ b/src/activities/menu/resource/category-music.svg
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-music.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8.0000004"
+ inkscape:cx="-0.75452122"
+ inkscape:cy="5.7225149"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <path
+ inkscape:connector-curvature="0"
+ id="path3"
+ style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.27471054;stroke-linecap:round;stroke-linejoin:round"
+ d="m 439.86323,518.11831 c 0.66404,0.98011 1.00543,2.16685 1.86112,3.01333 0.98007,1.29075 2.23261,2.3599 3.20378,3.66605 0.70285,0.91264 1.47328,1.88264 1.67281,3.03071 0.53731,1.47263 0.30402,3.12587 -0.26921,4.56752 -0.64675,0.77742 -1.0889,-0.2287 -0.90838,-0.85162 0.0275,-0.8595 0.015,-1.71672 -0.31467,-2.52855 -0.29236,-1.21749 -0.827,-2.36964 -1.72206,-3.26299 -0.77775,-0.68171 -1.66071,-2.18388 -2.84639,-1.66664 -0.78299,0.49325 -0.44187,1.49033 -0.52613,2.25885 -0.0465,4.7276 -0.0497,9.45705 -0.12523,14.18371 -0.0578,1.98513 -1.77358,3.31693 -3.37957,4.16919 -1.43075,0.86098 -3.14377,1.3432 -4.80457,0.95947 -1.54436,-0.15846 -3.14196,-1.28588 -3.17432,-2.95406 -0.10297,-1.93421 1.29395,-3.73533 3.0136,-4.49916 1.68811,-0.96217 3.82237,-1.17071 5.64018,-0.47907 0.8883,0.28077 1.13533,-0.54352 1.2462,-1.33638 0.10258,-6.01766 0.18469,-12.03532 0.20568,-18.0539 0.017,-0.60158 0.9968,-0.74839 1.22704,-0.21611 z" />
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-numeration.svg b/src/activities/menu/resource/category-numeration.svg
new file mode 100644
index 000000000..fa964d876
--- /dev/null
+++ b/src/activities/menu/resource/category-numeration.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-numeration.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16.000001"
+ inkscape:cx="8.2454787"
+ inkscape:cy="18.410014"
+ inkscape:document-units="px"
+ inkscape:current-layer="text843"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <g
+ aria-label="123"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ id="text843">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 16,0 A 16,16 0 0 0 0,16 16,16 0 0 0 16,32 16,16 0 0 0 32,16 16,16 0 0 0 16,0 Z M 7.4648438,10.138672 V 21.621094 L 4.6796875,21.861328 V 14.326172 L 2.9863281,15.195312 2,13.498047 Z m 18.3496092,0.1875 c 0.648873,0 1.278645,0.141494 1.890625,0.425781 0.605467,0.29514 1.090492,0.705509 1.455078,1.228516 0.284287,0.427513 0.425781,0.897782 0.425782,1.412109 0,0.134547 -0.0081,0.268011 -0.02539,0.400391 -0.05427,0.392793 -0.156914,0.72656 -0.306641,1 -0.160593,0.28646 -0.319882,0.504563 -0.480468,0.654297 -0.169274,0.151913 -0.263891,0.231554 -0.28125,0.240234 0.436199,0.212673 0.797744,0.577257 1.082031,1.09375 C 29.858505,17.29557 30,17.811632 30,18.328125 c 0,0.364587 -0.05685,0.701392 -0.171875,1.011719 -0.125867,0.3125 -0.282117,0.594183 -0.46875,0.84375 -0.186627,0.2474 -0.373914,0.450741 -0.560547,0.611328 -0.674913,0.58594 -1.64323,0.878906 -2.90625,0.878906 -0.781253,0 -1.510633,-0.146486 -2.185547,-0.439453 -0.68576,-0.292973 -1.284501,-0.734159 -1.798828,-1.322266 l 1.851563,-1.74414 c 0.07161,0.09765 0.197053,0.231117 0.375,0.40039 0.177953,0.1671 0.389318,0.308595 0.636718,0.425782 0.34722,0.15842 0.667971,0.248044 0.960938,0.267578 0.355907,-0.0282 0.676651,-0.14365 0.960937,-0.347657 0.275607,-0.203993 0.41211,-0.480904 0.41211,-0.828124 0,-0.258247 -0.05186,-0.484375 -0.158203,-0.679688 -0.115014,-0.195313 -0.266492,-0.324006 -0.453125,-0.384766 -0.32986,-0.08898 -0.774091,-0.132812 -1.333985,-0.132812 h -0.40039 c -0.07161,0.0087 -0.130428,0.01672 -0.173828,0.02539 v -2.027343 h 0.214843 c 0.09766,0.0087 0.208338,0.01672 0.332031,0.02539 0.479601,0 0.893008,-0.06988 1.240235,-0.210937 0.33854,-0.134547 0.507812,-0.409505 0.507812,-0.826172 0,-0.33854 -0.120441,-0.61046 -0.361328,-0.814453 C 26.278645,12.856554 25.9809,12.753906 25.625,12.753906 c -0.327693,0 -0.646705,0.08464 -0.957031,0.253906 -0.32118,0.177954 -0.531246,0.406034 -0.628907,0.681641 L 22.09375,12.380859 c 0.0456,-0.1237 0.179064,-0.324002 0.400391,-0.599609 0.221353,-0.275607 0.455511,-0.498695 0.705078,-0.667969 0.737846,-0.525173 1.610461,-0.787109 2.615234,-0.787109 z m -9.955078,0.113281 h 0.05469 c 0.692275,0 1.335068,0.133464 1.929688,0.400391 0.596787,0.266926 1.081811,0.654516 1.455078,1.160156 0.36458,0.507813 0.564669,1.116532 0.601563,1.826172 v 0.158203 c 0,0.551213 -0.159296,1.169702 -0.480469,1.855469 -0.3559,0.763886 -0.787316,1.421436 -1.292969,1.972656 l -1.119141,1.240234 h 3.238282 L 19.5918,21.560547 h -7.837891 l 4.039063,-4.841797 c 0.878906,-1.137153 1.318359,-1.944228 1.318359,-2.423828 v -0.08203 c -0.05207,-0.47092 -0.201585,-0.820742 -0.451172,-1.050782 -0.230033,-0.21484 -0.509983,-0.322265 -0.839844,-0.322265 h -0.07812 c -0.355901,0.0087 -0.650606,0.137138 -0.882813,0.386718 -0.230033,0.249568 -0.353734,0.552304 -0.371094,0.908204 v 0.05273 c 0,0.488287 0.310981,0.888672 0.931641,1.201172 l -1.560547,2.050781 c -0.0087,-0.0087 -0.114353,-0.0805 -0.318359,-0.212891 -0.203994,-0.134546 -0.399311,-0.276041 -0.585938,-0.425781 -0.729167,-0.685766 -1.09375,-1.561413 -1.09375,-2.626953 v -0.214844 c 0.02607,-0.674913 0.216392,-1.28863 0.572266,-1.839843 0.347226,-0.54254 0.832471,-0.958988 1.453125,-1.251953 0.596786,-0.284288 1.254343,-0.427735 1.972656,-0.427735 z"
+ transform="translate(421.71429,515.79074)"
+ id="path825"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-vocabulary.svg b/src/activities/menu/resource/category-vocabulary.svg
new file mode 100644
index 000000000..87f6e7e3c
--- /dev/null
+++ b/src/activities/menu/resource/category-vocabulary.svg
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-vocabulary.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.4142137"
+ inkscape:cx="9.4143568"
+ inkscape:cy="12.561466"
+ inkscape:document-units="px"
+ inkscape:current-layer="text843"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <g
+ aria-label="123"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ id="text843">
+ <g
+ aria-label="ABC"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:Kabel;-inkscape-font-specification:Kabel;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ id="text841" />
+ <path
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 437.36073,542.79074 c 0,-3 -14,-3 -14,-3 v -22 c 0,0 14,0 14,3 z"
+ id="path842"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccsc" />
+ <path
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 438.06785,542.79074 c 0,-3 14,-3 14,-3 v -22 c 0,0 -14,0 -14,3 z"
+ id="path842-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccsc" />
+ <path
+ style="fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 2,25 v 2 c 0,0 13,0 13,3 h 2 c 0,-3 13,-3 13,-3 v -2 c 0,0 -13,0 -13,3 H 15 C 15,25 2,25 2,25 Z"
+ transform="translate(421.71429,515.79074)"
+ id="path859"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/src/activities/menu/resource/category-words.svg b/src/activities/menu/resource/category-words.svg
new file mode 100644
index 000000000..d86c473f3
--- /dev/null
+++ b/src/activities/menu/resource/category-words.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ id="svg3049"
+ version="1.1"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="category-words.svg"
+ inkscape:export-filename="clock.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16.000001"
+ inkscape:cx="3.1829787"
+ inkscape:cy="17.222514"
+ inkscape:document-units="px"
+ inkscape:current-layer="text843"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false"
+ borderlayer="true"
+ inkscape:snap-bbox="true"
+ inkscape:snap-global="true">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4085" />
+ <sodipodi:guide
+ position="2.0000044,14.00003"
+ orientation="12,0"
+ id="guide4075"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="2.0000044,2.0000296"
+ orientation="0,12"
+ id="guide4077"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="30,17"
+ orientation="-12,0"
+ id="guide4079"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="18,30"
+ orientation="0,-12"
+ id="guide4081"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3054">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-421.71429,-515.79074)">
+ <g
+ aria-label="123"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ id="text843">
+ <path
+ style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 16,0 C 7.163444,0 0,7.163444 0,16 0,24.836556 7.163444,32 16,32 24.836556,32 32,24.836556 32,16 32,7.163444 24.836556,0 16,0 Z m -10.3164062,12.375 1.625,3.326172 0.984375,-3.078125 1.6386718,0.183594 -2.4238281,6.816406 -1.8710937,-3.816406 -1.9042969,3.816406 -2.3203125,-6.816406 1.671875,-0.201172 0.9277344,3.128906 z m 19.8613282,0.265625 v 6.623047 l -1.457031,0.144531 v -0.457031 c -0.09505,0.09635 -0.251958,0.203126 -0.470703,0.320312 -0.223961,0.11719 -0.503904,0.18164 -0.839844,0.19336 v -0.002 h -0.06445 c -0.427087,0 -0.821614,-0.104167 -1.183594,-0.3125 -0.384113,-0.218754 -0.694014,-0.525396 -0.929688,-0.919922 -0.23438,-0.394534 -0.354175,-0.821617 -0.359375,-1.28125 v -0.0293 c 0,-0.44792 0.104167,-0.869139 0.3125,-1.263672 0.21354,-0.404947 0.509766,-0.730469 0.888672,-0.976562 0.3724,-0.244794 0.79102,-0.367188 1.25586,-0.367188 0.565106,0 1.013023,0.16536 1.34375,0.496094 v -1.984375 z m -12.455078,1.589844 h 0.0625 c 0.5013,0 0.949216,0.106772 1.34375,0.320312 0.41146,0.22396 0.734376,0.533208 0.96875,0.927735 0.229166,0.394533 0.34375,0.837238 0.34375,1.328125 v 0.01563 c -0.0053,0.453126 -0.117311,0.86914 -0.335938,1.248046 -0.218746,0.378907 -0.517577,0.685549 -0.896484,0.919922 -0.377607,0.234374 -0.785156,0.367841 -1.222656,0.400391 -0.0586,0.0054 -0.117192,0.0098 -0.175782,0.0098 -0.41146,0 -0.806647,-0.09375 -1.185546,-0.28125 -0.442715,-0.212234 -0.794275,-0.510412 -1.054688,-0.894532 -0.266927,-0.384113 -0.408198,-0.819014 -0.423828,-1.304687 v -0.0957 c 0,-0.42708 0.106772,-0.832684 0.320312,-1.216797 0.229167,-0.404953 0.546226,-0.732422 0.951172,-0.982422 0.39974,-0.246093 0.834634,-0.376958 1.304688,-0.392578 z m 15.466797,0.08008 h 0.126953 c 0.416666,0 0.798171,0.0957 1.144531,0.287109 0.378907,0.218754 0.589842,0.373694 0.632813,0.464844 l -0.933594,0.839844 c 0,-0.0104 -0.01891,-0.03708 -0.05664,-0.08008 -0.04293,-0.03774 -0.08851,-0.07484 -0.136719,-0.111328 -0.0482,-0.03773 -0.117211,-0.07549 -0.207031,-0.113282 -0.09635,-0.03647 -0.203126,-0.05469 -0.320312,-0.05469 -0.14974,0 -0.280597,0.02929 -0.392579,0.08789 -0.117183,0.0638 -0.178393,0.154298 -0.183593,0.271485 v 0.01563 c 0,0.06901 0.05339,0.130203 0.160156,0.183593 0.106773,0.0534 0.245442,0.09637 0.416016,0.128907 0.170573,0.03126 0.346357,0.06317 0.527343,0.0957 0.304687,0.0586 0.593095,0.20248 0.865235,0.43164 0.260413,0.229168 0.390625,0.594404 0.390625,1.095704 v 0.0332 c -0.0053,0.30338 -0.103642,0.580724 -0.294922,0.832031 -0.19792,0.25 -0.453778,0.444664 -0.767578,0.583984 -0.29948,0.127607 -0.622397,0.191407 -0.96875,0.191407 h -0.08008 c -0.447914,-0.0156 -0.858722,-0.119767 -1.232422,-0.3125 -0.3737,-0.1862 -0.60287,-0.322263 -0.6875,-0.408203 l 0.77539,-1.015626 c 0.08594,0.09115 0.229821,0.200525 0.431641,0.328126 0.19792,0.127606 0.425134,0.191406 0.681641,0.191406 h 0.0293 c 0.180995,0 0.338543,-0.03711 0.472657,-0.111328 0.111979,-0.0638 0.167969,-0.149086 0.167969,-0.25586 v -0.04102 c -0.01694,-0.117187 -0.07032,-0.194009 -0.160157,-0.230469 -0.09115,-0.03253 -0.278,-0.07811 -0.560547,-0.136719 -0.287766,-0.0534 -0.533208,-0.122411 -0.736328,-0.207031 -0.602866,-0.266927 -0.904297,-0.720702 -0.904297,-1.361328 0,-0.303387 0.08529,-0.578126 0.25586,-0.824219 0.165366,-0.244793 0.386722,-0.436852 0.664062,-0.576172 0.27214,-0.138016 0.56576,-0.212236 0.88086,-0.222656 z m -10.326172,0.01563 v 0.808594 c 0.122393,-0.240887 0.306641,-0.43034 0.552734,-0.56836 0.239587,-0.139324 0.498051,-0.208984 0.775391,-0.208984 0.08463,0 0.162112,0.0045 0.232422,0.0098 0.06902,0.01173 0.116538,0.02019 0.142578,0.02539 l -0.486328,1.527344 c -0.01173,-0.0053 -0.04036,-0.01317 -0.08203,-0.02344 -0.043,-0.0053 -0.09899,-0.0078 -0.167968,-0.0078 -0.09635,0 -0.205725,0.01561 -0.328125,0.04687 -0.218747,0.0638 -0.363284,0.180989 -0.433594,0.351562 -0.06901,0.177087 -0.108731,0.409506 -0.119141,0.697266 0.01043,0.0534 0.01563,0.13608 0.01563,0.248047 l 0.002,-0.002 v 2.03125 l -1.591796,0.152343 v -4.904296 z m -5.080078,1.3125 c -0.211453,0.01065 -0.402882,0.06671 -0.574219,0.167969 -0.170573,0.106766 -0.303388,0.250647 -0.398438,0.43164 -0.101563,0.180987 -0.152343,0.37044 -0.152343,0.56836 0,0.3138 0.114583,0.58268 0.34375,0.80664 0.229166,0.22396 0.499353,0.335938 0.814453,0.335938 0.325526,-0.0104 0.602218,-0.127583 0.826172,-0.351563 0.218753,-0.218746 0.328125,-0.487627 0.328125,-0.80664 0,-0.330727 -0.115238,-0.608072 -0.345703,-0.832032 -0.229167,-0.21354 -0.503253,-0.320312 -0.822266,-0.320312 h -0.01758 z m 9.794921,0.0332 c -0.304686,0 -0.576819,0.104167 -0.816406,0.3125 -0.24555,0.213069 -0.37911,0.465667 -0.40039,0.757813 v 0.002 c -0.0052,0.04744 -0.0098,0.09243 -0.0098,0.134765 0,0.308594 0.09896,0.569657 0.296875,0.783203 0.217447,0.2513 0.475911,0.389976 0.775391,0.416016 0.03773,0.0054 0.07485,0.0098 0.111328,0.0098 0.292973,0 0.554689,-0.0931 0.785156,-0.279297 0.255207,-0.203127 0.399091,-0.467449 0.431641,-0.792969 0.0054,-0.03647 0.0098,-0.07358 0.0098,-0.111328 0,-0.180987 -0.04036,-0.356771 -0.121094,-0.527344 C 23.907552,16.16862 23.763672,16 23.576172,15.871094 c -0.1862,-0.127609 -0.391281,-0.194019 -0.615234,-0.199219 z"
+ transform="translate(421.71429,515.79074)"
+ id="path825"
+ inkscape:connector-curvature="0" />
+ <g
+ aria-label="ABC"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:Kabel;-inkscape-font-specification:Kabel;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ id="text841" />
+ <g
+ aria-label="Words"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;line-height:1.25;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+ id="text842" />
+ </g>
+ </g>
+</svg>
diff --git a/src/activities/note_names/NoteNames.qml b/src/activities/note_names/NoteNames.qml
index 9926f4a90..cba2316c2 100644
--- a/src/activities/note_names/NoteNames.qml
+++ b/src/activities/note_names/NoteNames.qml
@@ -1,425 +1,498 @@
/* GCompris - NoteNames.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.5
import GCompris 1.0
import "../../core"
import "../piano_composition"
import "note_names.js" as Activity
ActivityBase {
id: activity
+ property int speedSetting: 5
+ property int timerNormalInterval: (13500 / speedSetting)
+ isMusicalActivity: true
onStart: focus = true
onStop: {}
property bool horizontalLayout: width >= height
pageComponent: Rectangle {
id: background
anchors.fill: parent
color: "#ABCDEF"
-
signal start
signal stop
Component.onCompleted: {
+ dialogActivityConfig.getInitialConfiguration()
activity.start.connect(start)
activity.stop.connect(stop)
}
Keys.onPressed: {
var keyNoteBindings = {}
keyNoteBindings[Qt.Key_1] = 'C'
keyNoteBindings[Qt.Key_2] = 'D'
keyNoteBindings[Qt.Key_3] = 'E'
keyNoteBindings[Qt.Key_4] = 'F'
keyNoteBindings[Qt.Key_5] = 'G'
keyNoteBindings[Qt.Key_6] = 'A'
keyNoteBindings[Qt.Key_7] = 'B'
if(!introMessage.visible && !iAmReady.visible && !messageBox.visible && multipleStaff.musicElementModel.count - 1) {
if(keyNoteBindings[event.key]) {
// If the key pressed matches the note, pass the correct answer as parameter.
isCorrectKey(keyNoteBindings[event.key])
}
else if(event.key === Qt.Key_Left && shiftKeyboardLeft.visible) {
doubleOctave.currentOctaveNb--
}
else if(event.key === Qt.Key_Right && shiftKeyboardRight.visible) {
doubleOctave.currentOctaveNb++
}
}
}
function isCorrectKey(key) {
if(Activity.newNotesSequence[Activity.currentNoteIndex][0] === key)
Activity.correctAnswer()
else
items.displayNoteNameTimer.start()
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property GCSfx audioEffects: activity.audioEffects
property alias bar: bar
property alias multipleStaff: multipleStaff
property alias doubleOctave: doubleOctave
property alias bonus: bonus
property alias iAmReady: iAmReady
property alias messageBox: messageBox
property alias addNoteTimer: addNoteTimer
property alias dataset: dataset
property alias progressBar: progressBar
property alias introMessage: introMessage
property bool isTutorialMode: true
property alias displayNoteNameTimer: displayNoteNameTimer
}
Loader {
id: dataset
asynchronous: false
source: "qrc:/gcompris/src/activities/note_names/resource/dataset_01.qml"
}
- onStart: { Activity.start(items) }
+ onStart: { Activity.start(items, activity.timerNormalInterval) }
onStop: { Activity.stop() }
property string clefType: "Treble"
+ DialogActivityConfig {
+ id: dialogActivityConfig
+ currentActivity: activity
+ content: Component {
+ Item {
+ property alias speedSlider: speedSlider
+ height: column.height
+
+ Column {
+ id: column
+ spacing: 10 * ApplicationInfo.ratio
+ width: parent.width
+
+ GCText {
+ id: speedSliderText
+ text: qsTr("Speed")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ Flow {
+ width: dialogActivityConfig.width
+ spacing: 5
+ GCSlider {
+ id: speedSlider
+ width: 250 * ApplicationInfo.ratio
+ value: activity.speedSetting
+ maximumValue: 5
+ minimumValue: 1
+ scrollEnabled: false
+ }
+ }
+ }
+ }
+ }
+
+ onStart: {
+ if(!introMessage.visible || !iAmReady.visible) {
+ multipleStaff.pauseNoteAnimation()
+ addNoteTimer.pause()
+ }
+ }
+ onClose: {
+ home();
+ introMessage.visible = false;
+ iAmReady.visible = true;
+ }
+ onLoadData: {
+ if(dataToSave) {
+ if(dataToSave["speedSetting"]) {
+ activity.speedSetting = dataToSave["speedSetting"];
+ }
+ }
+ }
+ onSaveData: {
+ var oldSpeed = activity.speedSetting
+ activity.speedSetting = dialogActivityConfig.configItem.speedSlider.value
+ if(oldSpeed != activity.speedSetting) {
+ dataToSave = {"speedSetting": activity.speedSetting};
+ background.stop();
+ introMessage.visible = false;
+ iAmReady.visible = true;
+ }
+ }
+ }
+
Timer {
id: displayNoteNameTimer
interval: 2000
onRunningChanged: {
if(running) {
multipleStaff.pauseNoteAnimation()
addNoteTimer.pause()
messageBox.visible = true
}
else {
messageBox.visible = false
if(progressBar.percentage != 100 && Activity.newNotesSequence.length) {
Activity.wrongAnswer()
addNoteTimer.resume()
}
}
}
}
Rectangle {
id: messageBox
width: label.width + 20
height: label.height + 20
border.width: 5
border.color: "black"
anchors.centerIn: multipleStaff
radius: 10
z: 11
visible: false
function getTranslatedNoteName(noteName) {
for(var i = 0; i < doubleOctave.keyNames.length; i++) {
if(doubleOctave.keyNames[i][0] == noteName)
return doubleOctave.keyNames[i][1]
}
return ""
}
onVisibleChanged: {
if(Activity.targetNotes[0] === undefined)
text = ""
else if(items.isTutorialMode)
text = qsTr("New note: %1").arg(getTranslatedNoteName(Activity.targetNotes[0]))
else
text = getTranslatedNoteName(Activity.newNotesSequence[Activity.currentNoteIndex])
}
property string text
GCText {
id: label
anchors.centerIn: parent
fontSize: mediumSize
text: parent.text
}
MouseArea {
anchors.fill: parent
enabled: items.isTutorialMode
onClicked: {
items.multipleStaff.pauseNoteAnimation()
items.multipleStaff.musicElementModel.remove(1)
Activity.showTutorial()
}
}
}
Rectangle {
id: colorLayer
anchors.fill: parent
color: "black"
opacity: 0.3
visible: iAmReady.visible
z: 10
MouseArea {
anchors.fill: parent
}
}
ReadyButton {
id: iAmReady
focus: true
z: 10
visible: !introMessage.visible
onVisibleChanged: {
messageBox.visible = false
}
onClicked: {
Activity.initLevel()
}
}
IntroMessage {
id: introMessage
anchors {
top: parent.top
topMargin: 10
right: parent.right
rightMargin: 5
left: parent.left
leftMargin: 5
}
z: 12
}
AdvancedTimer {
id: addNoteTimer
onTriggered: {
Activity.noteIndexToDisplay = (Activity.noteIndexToDisplay + 1) % Activity.newNotesSequence.length
Activity.displayNote(Activity.newNotesSequence[Activity.noteIndexToDisplay])
}
}
ProgressBar {
id: progressBar
height: 20 * ApplicationInfo.ratio
width: parent.width / 4
property int percentage: 0
value: percentage
maximumValue: 100
visible: !items.isTutorialMode
anchors {
top: parent.top
topMargin: 10
right: parent.right
rightMargin: 10
}
GCText {
anchors.centerIn: parent
fontSize: mediumSize
font.bold: true
color: "black"
//: The following translation represents percentage.
text: qsTr("%1%").arg(parent.value)
z: 2
}
}
MultipleStaff {
id: multipleStaff
width: horizontalLayout ? parent.width * 0.5 : parent.width * 0.78
height: horizontalLayout ? parent.height * 0.9 : parent.height * 0.7
nbStaves: 1
clef: clefType
notesColor: "red"
softColorOpacity: 0
isFlickable: false
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: parent.top
anchors.topMargin: progressBar.height + 20
flickableTopMargin: multipleStaff.height / 14 + distanceBetweenStaff / 2.7
noteAnimationEnabled: true
+ noteAnimationDuration: items.isTutorialMode ? 9000 : 45000 / activity.speedSetting
onNoteAnimationFinished: {
if(!items.isTutorialMode)
displayNoteNameTimer.start()
}
}
// We present a pair of two joint piano keyboard octaves.
Item {
id: doubleOctave
width: parent.width * 0.95
height: horizontalLayout ? parent.height * 0.22 : 2 * parent.height * 0.18
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: bar.top
anchors.bottomMargin: 30
readonly property int nbJointKeyboards: 2
readonly property int maxNbOctaves: 3
property int currentOctaveNb: 0
property var coloredKeyLabels: []
property var keyNames: []
Repeater {
id: octaveRepeater
anchors.fill: parent
model: doubleOctave.nbJointKeyboards
PianoOctaveKeyboard {
id: pianoKeyboard
width: horizontalLayout ? octaveRepeater.width / 2 : octaveRepeater.width
height: horizontalLayout ? octaveRepeater.height : octaveRepeater.height / 2
blackLabelsVisible: false
blackKeysEnabled: blackLabelsVisible
whiteKeysEnabled: !messageBox.visible && multipleStaff.musicElementModel.count > 1
onNoteClicked: Activity.checkAnswer(note)
currentOctaveNb: doubleOctave.currentOctaveNb
anchors.top: (index === 1) ? octaveRepeater.top : undefined
anchors.topMargin: horizontalLayout ? 0 : -15
anchors.bottom: (index === 0) ? octaveRepeater.bottom : undefined
anchors.right: (index === 1) ? octaveRepeater.right : undefined
coloredKeyLabels: doubleOctave.coloredKeyLabels
labelsColor: "red"
// The octaves sets corresponding to respective clef types are in pairs for the joint piano keyboards at a time when displaying.
whiteKeyNoteLabelsBass: {
if(index === 0) {
return [
whiteKeyNoteLabelsArray.slice(0, 4), // F1 to B1
whiteKeyNoteLabelsArray.slice(4, 11), // C2 to B2
whiteKeyNoteLabelsArray.slice(11, 18) // C3 to B3
]
}
else {
return [
whiteKeyNoteLabelsArray.slice(4, 11), // C2 to B2
whiteKeyNoteLabelsArray.slice(11, 18), // C3 to B3
whiteKeyNoteLabelsArray.slice(18, 25) // C4 to B4
]
}
}
whiteKeyNoteLabelsTreble: {
if(index === 0) {
return [
whiteKeyNoteLabelsArray.slice(11, 18), // C3 to B3
whiteKeyNoteLabelsArray.slice(18, 25), // C4 to B4
whiteKeyNoteLabelsArray.slice(25, 32) // C5 to B5
]
}
else {
return [
whiteKeyNoteLabelsArray.slice(18, 25), // C4 to B4
whiteKeyNoteLabelsArray.slice(25, 32), // C5 to B5
whiteKeyNoteLabelsArray.slice(32, 34) // C6 to D6
]
}
}
Component.onCompleted: doubleOctave.keyNames = whiteKeyNoteLabelsArray
}
}
}
Image {
id: shiftKeyboardLeft
source: "qrc:/gcompris/src/core/resource/bar_previous.svg"
sourceSize.width: horizontalLayout ? doubleOctave.width / 13 : doubleOctave.width / 6
width: sourceSize.width
height: width
fillMode: Image.PreserveAspectFit
visible: (doubleOctave.currentOctaveNb > 0) && doubleOctave.visible
z: 11
anchors {
bottom: doubleOctave.top
left: doubleOctave.left
leftMargin: -37
bottomMargin: horizontalLayout ? 10 : 25
}
MouseArea {
enabled: !messageBox.visible
anchors.fill: parent
onClicked: {
doubleOctave.currentOctaveNb--
}
}
}
Image {
id: shiftKeyboardRight
source: "qrc:/gcompris/src/core/resource/bar_next.svg"
sourceSize.width: horizontalLayout ? doubleOctave.width / 13 : doubleOctave.width / 6
width: sourceSize.width
height: width
fillMode: Image.PreserveAspectFit
visible: (doubleOctave.currentOctaveNb < doubleOctave.maxNbOctaves - 1) && doubleOctave.visible
z: 11
anchors {
bottom: doubleOctave.top
right: doubleOctave.right
rightMargin: -37
bottomMargin: horizontalLayout ? 10 : 25
}
MouseArea {
enabled: !messageBox.visible
anchors.fill: parent
onClicked: {
doubleOctave.currentOctaveNb++
}
}
}
OptionsRow {
id: optionsRow
iconsWidth: 0
visible: false
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
- content: BarEnumContent { value: help | home | level | reload }
+ content: BarEnumContent { value: (help | home | level | reload | config) }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
+ onConfigClicked: {
+ dialogActivityConfig.active = true
+ displayDialog(dialogActivityConfig)
+ }
onReloadClicked: {
iAmReady.visible = true
Activity.initLevel()
}
}
Bonus {
id: bonus
Component.onCompleted: win.connect(Activity.nextLevel)
}
}
}
diff --git a/src/activities/note_names/note_names.js b/src/activities/note_names/note_names.js
index 5846c4d26..8e94ce474 100644
--- a/src/activities/note_names/note_names.js
+++ b/src/activities/note_names/note_names.js
@@ -1,177 +1,179 @@
/* GCompris - note_names.js
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import "qrc:/gcompris/src/core/core.js" as Core
var currentLevel = 0
var numberOfLevel
var dataset
var items
var levels
var targetNotes = []
var newNotesSequence = []
var currentNoteIndex
var noteIndexToDisplay
var percentageDecreaseValue = 4
var percentageIncreaseValue = 2
+var timerNormalInterval
-function start(items_) {
+function start(items_, timerNormalInterval_) {
items = items_
currentLevel = 0
+ timerNormalInterval = timerNormalInterval_
dataset = items.dataset.item
levels = dataset.levels
numberOfLevel = levels.length
items.doubleOctave.coloredKeyLabels = dataset.referenceNotes[levels[0]["clef"]]
items.doubleOctave.currentOctaveNb = 1
items.introMessage.intro = [dataset.objective]
initLevel()
}
function stop() {
newNotesSequence = []
items.multipleStaff.pauseNoteAnimation()
items.displayNoteNameTimer.stop()
items.addNoteTimer.stop()
}
function initLevel() {
targetNotes = []
newNotesSequence = []
items.bar.level = currentLevel + 1
items.background.clefType = levels[currentLevel]["clef"]
items.doubleOctave.coloredKeyLabels = dataset.referenceNotes[items.background.clefType]
if(items.background.clefType === "Treble")
items.doubleOctave.currentOctaveNb = 1
else
items.doubleOctave.currentOctaveNb = 2
items.multipleStaff.pauseNoteAnimation()
items.displayNoteNameTimer.stop()
items.addNoteTimer.stop()
items.multipleStaff.initClefs(items.background.clefType)
targetNotes = JSON.parse(JSON.stringify(levels[currentLevel]["sequence"]))
items.isTutorialMode = true
items.progressBar.percentage = 0
items.multipleStaff.coloredNotes = dataset.referenceNotes[items.background.clefType]
- if(!items.iAmReady.visible && ! items.introMessage.visible)
+ if(!items.iAmReady.visible && !items.introMessage.visible)
showTutorial()
}
function showTutorial() {
items.messageBox.visible = false
if(targetNotes.length) {
displayNote(targetNotes[0])
items.messageBox.visible = true
targetNotes.shift()
}
- else {
+ else if (!items.iAmReady.visible) {
items.isTutorialMode = false
startGame()
}
}
// The principle is to fill half sequence (length 25) with the notes from previous levels and another half with current level's target notes and shuffle them.
function formNewNotesSequence() {
var halfSequenceLength = 25
var fullSequenceLength = 50
targetNotes = JSON.parse(JSON.stringify(levels[currentLevel]["sequence"]))
for(var i = 0; i < currentLevel && newNotesSequence.length < halfSequenceLength; i++) {
if(levels[currentLevel]["clef"] === levels[i]["clef"]) {
for(var j = 0; j < levels[i]["sequence"].length && newNotesSequence.length < halfSequenceLength; j++)
newNotesSequence.push(levels[i]["sequence"][j])
}
}
for(var i = 0; newNotesSequence.length && newNotesSequence.length < halfSequenceLength; i++)
newNotesSequence.push(newNotesSequence[i % newNotesSequence.length])
for(var i = 0; newNotesSequence.length < fullSequenceLength; i++)
newNotesSequence.push(targetNotes[i % targetNotes.length])
Core.shuffle(newNotesSequence)
}
function startGame() {
currentNoteIndex = 0
noteIndexToDisplay = 0
items.progressBar.percentage = 0
formNewNotesSequence()
displayNote(newNotesSequence[0])
}
function displayNote(currentNote) {
items.multipleStaff.addMusicElement("note", currentNote, "Quarter", false, false, items.background.clefType)
items.multipleStaff.playNoteAudio(currentNote, "Quarter", items.background.clefType, 500)
if(!items.isTutorialMode) {
- items.addNoteTimer.interval = items.addNoteTimer.timerNormalInterval
+ items.addNoteTimer.interval = timerNormalInterval
items.addNoteTimer.start()
}
}
function wrongAnswer() {
if(items.multipleStaff.musicElementRepeater.itemAt(1).x <= items.multipleStaff.clefImageWidth) {
items.multipleStaff.musicElementModel.remove(1)
currentNoteIndex = (currentNoteIndex + 1) % newNotesSequence.length
}
items.progressBar.percentage = Math.max(0, items.progressBar.percentage - percentageDecreaseValue)
items.multipleStaff.resumeNoteAnimation()
if(items.multipleStaff.musicElementModel.count <= 1)
items.addNoteTimer.restart()
}
function correctAnswer() {
currentNoteIndex = (currentNoteIndex + 1) % newNotesSequence.length
items.multipleStaff.pauseNoteAnimation()
items.multipleStaff.musicElementModel.remove(1)
items.multipleStaff.resumeNoteAnimation()
items.progressBar.percentage += percentageIncreaseValue
if(items.progressBar.percentage === 100) {
items.multipleStaff.pauseNoteAnimation()
items.displayNoteNameTimer.stop()
items.addNoteTimer.stop()
items.bonus.good("flower")
}
else if(items.multipleStaff.musicElementModel.count <= 1)
items.addNoteTimer.restart()
}
function checkAnswer(noteName) {
if(noteName === items.multipleStaff.musicElementModel.get(1).noteName_)
correctAnswer()
else
items.displayNoteNameTimer.start()
}
function nextLevel() {
if(numberOfLevel <= ++ currentLevel) {
currentLevel = 0
}
initLevel()
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
initLevel()
}
diff --git a/src/activities/number_sequence/NumberSequence.qml b/src/activities/number_sequence/NumberSequence.qml
index 016e9f41f..363017ddc 100644
--- a/src/activities/number_sequence/NumberSequence.qml
+++ b/src/activities/number_sequence/NumberSequence.qml
@@ -1,263 +1,327 @@
/* GCompris - NumberSequence.qml
*
* Copyright (C) 2014 Emmanuel Charruau <echarruau@gmail.com>
*
* Authors:
* Olivier Ponchaut <opvg@mailoo.org> (GTK+ version)
* Emmanuel Charruau <echarruau@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "."
import "number_sequence.js" as Activity
import "number_sequence_dataset.js" as Dataset
ActivityBase {
id: activity
property string mode: "number_sequence"
property var dataset: Dataset
property real pointImageOpacity: 1.0
property string url: "qrc:/gcompris/src/activities/number_sequence/resource/"
onStart: focus = true
onStop: {}
pageComponent: Image {
id: background
anchors.fill: parent
source: "qrc:/gcompris/src/activities/checkers/resource/background-wood.svg"
sourceSize.width: parent.width
sourceSize.height: parent.height
signal start
signal stop
Component.onCompleted: {
+ dialogActivityConfig.getInitialConfiguration()
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property GCSfx audioEffects: activity.audioEffects
property GCAudio audioVoices: activity.audioVoices
property alias pointImageRepeater: pointImageRepeater
property alias segmentsRepeater: segmentsRepeater
property alias imageBack: imageBack
property alias imageBack2: imageBack2
property int pointIndexToClick
+ property int mode: 1
}
onStart: { Activity.start(items,mode,dataset,url) }
onStop: { Activity.stop() }
Image {
id: imageBack
anchors.top: parent.top
anchors.horizontalCenter: background.horizontalCenter
width: Math.min((background.height - bar.height * 1.5), background.width)
height: imageBack.width
sourceSize.width: imageBack.width
sourceSize.height: imageBack.height
}
Image {
id: imageBack2
anchors.centerIn: imageBack
width: imageBack.width
height: imageBack.height
sourceSize.width: imageBack2.width
sourceSize.height: imageBack2.height
}
Repeater {
id: segmentsRepeater
Rectangle {
id: line
opacity: 0
color: "#373737"
transformOrigin: Item.TopLeft
x: imageBack.x + modelData[0] * imageBack.width / 520
y: modelData[1] * imageBack.height / 520
property double x2: imageBack.x + modelData[2] * imageBack.width / 520
property double y2: modelData[3] * imageBack.height / 520
width: Math.sqrt(Math.pow(x - x2, 2) + Math.pow(y- y2, 2))
height: 3 * ApplicationInfo.ratio
rotation: (Math.atan((y2 - y)/(x2-x)) * 180 / Math.PI) + (((y2-y) < 0 && (x2-x) < 0) * 180) + (((y2-y) >= 0 && (x2-x) < 0) * 180)
}
}
Item {
id: playArea
anchors.fill: parent
Repeater {
id: pointImageRepeater
Image {
id: pointImage
source: Activity.url + (highlight ?
(pointImageOpacity ? "bluepoint.svg" : "bluepointHighlight.svg") :
markedAsPointInternal ? "blackpoint.svg" : "greenpoint.svg")
sourceSize.height: bar.height / 4 //to change the size of dots
x: imageBack.x + modelData[0] * imageBack.width / 520 - sourceSize.height/2
y: modelData[1] * imageBack.height / 520 - sourceSize.height/2
z: items.pointIndexToClick == index ? 1000 : index
// only hide last point for clickanddraw and number_sequence
// as the last point is also the first point
visible: (mode=="clickanddraw" || mode=="number_sequence") &&
index == pointImageRepeater.count - 1 &&
items.pointIndexToClick == 0 ? false : true
function drawSegment() {
Activity.drawSegment(index)
}
property bool highlight: false
// draw a point instead of hiding the clicked node if it is
// the first point of the current line to draw
// (helpful to know where the line starts)
property bool markedAsPointInternal: markedAsPoint && items.pointIndexToClick == index+1
property bool markedAsPoint: false
scale: markedAsPointInternal ? 0.2 : 1
opacity: index >= items.pointIndexToClick || markedAsPointInternal ? 1 : 0
GCText {
id: pointNumberText
opacity: pointImageOpacity
text: index + 1
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
fontSize: 11
font.weight: Font.DemiBold
style: Text.Outline
styleColor: "black"
color: "white"
}
ParallelAnimation {
id: anim
running: pointImageOpacity == 0 && items.pointIndexToClick == index
loops: Animation.Infinite
SequentialAnimation {
NumberAnimation {
target: pointImage
property: "rotation"
from: -150; to: 150
duration: 3000
easing.type: Easing.InOutQuad
}
NumberAnimation {
target: pointImage
property: "rotation"
from: 150; to: -150
duration: 3000
easing.type: Easing.InOutQuad
}
}
SequentialAnimation {
NumberAnimation {
target: pointImage
property: "scale"
from: 1; to: 1.5
duration: 1500
easing.type: Easing.InOutQuad
}
NumberAnimation {
target: pointImage
property: "scale"
from: 1.5; to: 1
duration: 1500
easing.type: Easing.InOutQuad
}
NumberAnimation {
target: pointImage
property: "scale"
from: 1; to: 1.5
duration: 1500
easing.type: Easing.InOutQuad
}
NumberAnimation {
target: pointImage
property: "scale"
from: 1.5; to: 1
duration: 1500
easing.type: Easing.InOutQuad
}
}
}
}
}
}
MultiPointTouchArea {
anchors.fill: parent
minimumTouchPoints: 1
maximumTouchPoints: 1
z: 100
function checkPoints(touchPoints) {
for(var i in touchPoints) {
var touch = touchPoints[i]
for(var p = 0; p < pointImageRepeater.count; p++) {
var part = pointImageRepeater.itemAt(p)
// Could not make it work with the item.contains() api
if(touch.x > part.x && touch.x < part.x + part.width &&
touch.y > part.y && touch.y < part.y + part.height) {
part.drawSegment()
}
}
}
}
onPressed: {
checkPoints(touchPoints)
}
onTouchUpdated: {
checkPoints(touchPoints)
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
+
+ DialogActivityConfig {
+ id: dialogActivityConfig
+ currentActivity: activity
+ content: Component {
+ Item {
+ property alias modeBox: modeBox
+
+ property var availableModes: [
+ { "text": qsTr("Automatic"), "value": 1 },
+ { "text": qsTr("Manual"), "value": 2 }
+ ]
+
+ Flow {
+ id: flow
+ spacing: 5
+ width: dialogActivityConfig.width
+ GCComboBox {
+ id: modeBox
+ model: availableModes
+ background: dialogActivityConfig
+ label: qsTr("Go to next level")
+ }
+ }
+ }
+ }
+
+ onClose: home()
+
+ onLoadData: {
+ if(dataToSave && dataToSave["mode"]) {
+ items.mode = dataToSave["mode"];
+ }
+ }
+ onSaveData: {
+ var newMode = dialogActivityConfig.configItem.availableModes[dialogActivityConfig.configItem.modeBox.currentIndex].value;
+ if (newMode !== items.mode) {
+ items.mode = newMode;
+ dataToSave = {"mode": items.mode};
+ }
+ if (items.mode == 1) {
+ bonus.win.connect(Activity.nextLevel)
+ } else {
+ bonus.win.disconnect(Activity.nextLevel)
+ }
+ Activity.initLevel();
+ }
+ function setDefaultValues() {
+ for(var i = 0 ; i < dialogActivityConfig.configItem.availableModes.length ; i++) {
+ if(dialogActivityConfig.configItem.availableModes[i].value === items.mode) {
+ dialogActivityConfig.configItem.modeBox.currentIndex = i;
+ break;
+ }
+ }
+ }
+ }
Bar {
id: bar
- content: BarEnumContent { value: help | home | level }
+ content: BarEnumContent { value: help | home | level | config }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
+ onConfigClicked: {
+ dialogActivityConfig.active = true
+ // Set default values
+ dialogActivityConfig.setDefaultValues();
+ displayDialog(dialogActivityConfig)
+ }
}
Bonus {
id: bonus
- Component.onCompleted: win.connect(Activity.nextLevel)
+ Component.onCompleted: items.mode == 1 ? win.connect(Activity.nextLevel) : win.disconnect(Activity.nextLevel)
}
}
}
diff --git a/src/activities/photo_hunter/Observe.qml b/src/activities/photo_hunter/Observe.qml
index 0d45fad31..5790e1266 100644
--- a/src/activities/photo_hunter/Observe.qml
+++ b/src/activities/photo_hunter/Observe.qml
@@ -1,192 +1,191 @@
/* GCompris - Observe.qml
*
* Copyright (C) 2016 Stefan Toncu <stefan.toncu29@gmail.com>
*
* Authors:
* <Marc Le Douarain> (GTK+ version)
* Stefan Toncu <stefan.toncu29@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "photo_hunter.js" as Activity
Image {
id: card
- sourceSize.width: background.startedHelp ? background.width :
- background.vert ? background.width : (background.width - 30) / 2
+ sourceSize.width: background.vert ? background.width : (background.width - 30) / 2
sourceSize.height: background.startedHelp ? background.height - background.barHeight * 1.5 - frame.problemTextHeight - slider.height :
background.vert ? (background.height - background.barHeight - 40 - frame.problemTextHeight) / 2 :
background.height - background.barHeight - 30 - frame.problemTextHeight
property GCSfx audioEffects: activity.audioEffects
property alias repeater: repeater
property alias circleRepeater: circleRepeater
property int good: 0
property bool show: false
Behavior on anchors.horizontalCenterOffset {
enabled: !background.vert
NumberAnimation {
duration: 1000
easing.type: Easing.InOutQuad
}
}
Behavior on anchors.verticalCenterOffset {
enabled: background.vert
NumberAnimation {
duration: 1000
easing.type: Easing.InOutQuad
}
}
Image {
id: wrong
source: Activity.url + "wrong.svg"
width: 70
height: 70
opacity: 0
}
NumberAnimation {
id: wrongAnim
target: wrong
property: "opacity"
from: 0
to: 1
duration: 400
}
NumberAnimation {
id: wrongAnim2
target: wrong
property: "opacity"
from: 1
to: 0
duration: 400
}
MouseArea {
id: big
anchors.fill: parent
enabled: !background.startedHelp
onClicked: {
audioEffects.play('qrc:/gcompris/src/core/resource/sounds/brick.wav')
wrongAnim.start()
wrong.x = mouseX - wrong.width/2
wrong.y = mouseY - wrong.height/2
wrongAnim2.start()
}
}
Repeater {
id: repeater
model: items.model
Image {
id: photo
property alias particleLoader: particleLoader
property alias differenceAnimation: differenceAnimation
property double widthScale: Activity.dataset[Activity.currentLevel].coordinates[index].w
property double heightScale: Activity.dataset[Activity.currentLevel].coordinates[index].h
sourceSize.width: Activity.dataset[Activity.currentLevel].coordinates[index].r * 200
sourceSize.height: Activity.dataset[Activity.currentLevel].coordinates[index].r * 200
width: card.width / 10 * widthScale
height: card.height / 10 * heightScale
source: Activity.url + "photo" + (Activity.currentLevel + 1) + "_" + (index + 1) + ".svg"
opacity: card.show ? 1 : 0
x: modelData[0] * card.width / 1200
y: modelData[1] * card.height / 1700
NumberAnimation {
id: differenceAnimation
target: photo
property: "opacity"
from: 0
to: 1
duration: 500
}
// Create a particle only for the strawberry
Loader {
id: particleLoader
anchors.fill: parent
active: true
sourceComponent: particle
}
Component {
id: particle
ParticleSystemStarLoader {
id: particles
clip: false
}
}
MouseArea {
id: mouseArea
anchors.centerIn: parent
width: parent.width * 3
height: parent.height * 3
enabled: !background.startedHelp
onClicked: {
Activity.photoClicked(card,index)
audioEffects.play('qrc:/gcompris/src/core/resource/sounds/bleep.wav')
}
}
}
}
Repeater {
id: circleRepeater
model: card.repeater.model
Rectangle {
id: circle
color: "transparent"
radius: width * 0.5
border.color: card.show ? "blue" : "red"
border.width: 6
opacity: 0
x: itemAt.x - width / 6
y: itemAt.y - height / 6
width: itemAt.width * 1.5
height: itemAt.height * 1.5
property alias scaleAnim: scaleAnim
property var itemAt: card.repeater.itemAt(index) ? card.repeater.itemAt(index) : card
NumberAnimation {
id: scaleAnim
target: circle
property: "scale"
from: 0
to: circle.scale
duration: 700
}
}
}
}
diff --git a/src/activities/piano_composition/ActivityInfo.qml b/src/activities/piano_composition/ActivityInfo.qml
index a00d89258..c6d81d802 100644
--- a/src/activities/piano_composition/ActivityInfo.qml
+++ b/src/activities/piano_composition/ActivityInfo.qml
@@ -1,58 +1,59 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2016 Johnny Jazeix <jazeix@gmail.com>
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "piano_composition/Piano_composition.qml"
difficulty: 2
icon: "piano_composition/piano_composition.svg"
author: "Aman Kumar Gupta &lt;gupta2140@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Piano Composition")
//: Help title
description: qsTr("An activity to learn how the piano keyboard works, how notes are written on a musical staff and explore music composition by loading and saving your work.")
+ //intro: "Learn to compose piano music using the octaves and the tools presented above the staff."
//: Help goal
- goal: qsTr("Develop an understanding of music composition, and increase interest in making music with a piano keyboard. This activity covers many fundamental aspects of music, but there is much more to explore about music composition. If you enjoy this activity but want a more advanced tool, try downloading Minuet (https://minuet.kde.org/), an open source software for music education or MuseScore (http://musescore.org/en/download), an open source music notation tool.")
+ goal: qsTr("Develop an understanding of music composition, and increase interest in making music with a piano keyboard. This activity covers many fundamental aspects of music, but there is much more to explore about music composition. If you enjoy this activity but want a more advanced tool, try downloading Minuet (https://minuet.kde.org/), an open source software for music education or MuseScore (https://musescore.org/en/download), an open source music notation tool.")
//: Help prerequisite
prerequisite: qsTr("Familiarity with note naming conventions, note-names activity useful to learn this notation.")
//: Help manual
manual: qsTr("This activity has several levels, each level adds a new functionality to the previous level.
Level 1: Basic piano keyboard (white keys only) and students can experiment with clicking the colored rectangle keys to write music.
Level 2: The musical staff switches to bass clef, so pitches are lower than in previous level.
Level 3: Option to choose between treble and bass clef, addition of black keys (sharp keys).
Level 4: Flat notation used for black keys.
Level 5: Option to select note duration (whole, half, quarter, eighth notes).
Level 6: Addition of rests (whole, half, quarter, eighth rests)
Level 7: Load children's melodies from around the world and also save your composition.
The following keyboard bindings work in this game:
- backspace: undo
- delete: erase attempt
- enter/return: OK button
- space bar: play
- left/right arrow keys: switch keyboard octave
- number keys:
- 1 to 8: Corresponding white keys in the order on the displayed octave.
- F1 to F5: Corresponding black keys in the order on the displayed octave.
")
credit: qsTr("The synthesizer original code is https://github.com/vsr83/miniSynth")
section: "discovery music"
createdInVersion: 9500
}
diff --git a/src/activities/piano_composition/MultipleStaff.qml b/src/activities/piano_composition/MultipleStaff.qml
index 3f1aeb886..10f63ea29 100644
--- a/src/activities/piano_composition/MultipleStaff.qml
+++ b/src/activities/piano_composition/MultipleStaff.qml
@@ -1,605 +1,606 @@
/* GCompris - MultipleStaff.qml
*
* Copyright (C) 2016 Johnny Jazeix <jazeix@gmail.com>
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Beth Hadley <bethmhadley@gmail.com> (GTK+ version)
* Johnny Jazeix <jazeix@gmail.com> (Qt Quick port)
* Aman Kumar Gupta <gupta2140@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "qrc:/gcompris/src/activities/piano_composition/NoteNotations.js" as NoteNotations
Item {
id: multipleStaff
property int nbStaves
property string clef
property int distanceBetweenStaff: multipleStaff.height / 3.3
readonly property real clefImageWidth: 3 * height / 25
// Stores the note index which is selected.
property int selectedIndex: -1
// The notes that are to be colored can be assigned to this variable in the activity
property var coloredNotes: []
// When the notesColor is inbuilt, the default color mapping will be done, else assign any color externally in the activity. Example: Reference notes in note_names are red colored.
property string notesColor: "inbuilt"
property bool noteHoverEnabled: false
// Stores if the notes are to be centered on the staff. Used in Play_piano and Play_rhythm.
property bool centerNotesPosition: false
property bool isPulseMarkerDisplayed: false
property bool noteAnimationEnabled: false
readonly property bool isMusicPlaying: musicTimer.running
property alias flickableStaves: flickableStaves
property alias musicElementModel: musicElementModel
property alias musicElementRepeater: musicElementRepeater
property double softColorOpacity : 0.8
property real flickableTopMargin: multipleStaff.height / 14 + distanceBetweenStaff / 3.5
readonly property real pulseMarkerX: pulseMarker.x
readonly property bool isPulseMarkerRunning: pulseMarkerAnimation.running
property bool isFlickable: true
property bool enableNotesSound: true
property int currentEnteringStaff: 0
property int bpmValue: 120
+ property real noteAnimationDuration: 9000
// The position where the 1st note in the centered state is to be placed.
property real firstCenteredNotePosition: multipleStaff.width / 3.3
property real spaceBetweenNotes: 0
/**
* Emitted when a note is clicked.
*
* It is used for selecting note to play, erase and do other operations on it.
*/
signal noteClicked(int noteIndex)
/**
* Emitted when the animation of the note from the right of the staff to the left is finished.
*
* It's used in note_names activity.
*/
signal noteAnimationFinished
/**
* Emitted when the pulseMarker's animation is finished.
*/
signal pulseMarkerAnimationFinished
/**
* Used in play_rhythm activity. It tells the instants when pulseMarker reaches a note and the drum sound is to be played.
*/
signal playDrumSound
ListModel {
id: musicElementModel
}
Flickable {
id: flickableStaves
interactive: multipleStaff.isFlickable
flickableDirection: Flickable.VerticalFlick
contentWidth: staffColumn.width
contentHeight: staffColumn.height + distanceBetweenStaff
anchors.fill: parent
clip: true
Behavior on contentY {
NumberAnimation { duration: 250 }
}
Column {
id: staffColumn
spacing: distanceBetweenStaff
anchors.top: parent.top
anchors.topMargin: flickableTopMargin
Repeater {
id: staves
model: nbStaves
Staff {
id: staff
height: multipleStaff.height / 5
width: multipleStaff.width - 5
lastPartition: index == (nbStaves - 1)
}
}
}
Repeater {
id: musicElementRepeater
model: musicElementModel
MusicElement {
id: musicElement
noteName: noteName_
noteType: noteType_
highlightWhenPlayed: highlightWhenPlayed_
noteIsColored: multipleStaff.coloredNotes.indexOf(noteName[0]) != -1
soundPitch: soundPitch_
clefType: clefType_
elementType: elementType_
isDefaultClef: isDefaultClef_
property int staffNb: staffNb_
property alias noteAnimation: noteAnimation
// The shift which the elements experience when a sharp/flat note is added before them.
readonly property real sharpShiftDistance: blackType != "" ? width / 6 : 0
noteDetails: multipleStaff.getNoteDetails(noteName, noteType, clefType)
MouseArea {
id: noteMouseArea
anchors.fill: parent
hoverEnabled: true
onClicked: multipleStaff.noteClicked(index)
}
function highlightNote() {
highlightTimer.start()
}
readonly property real defaultXPosition: musicElementRepeater.itemAt(index - 1) ? (musicElementRepeater.itemAt(index - 1).width + musicElementRepeater.itemAt(index - 1).x)
: 0
x: {
if(multipleStaff.noteAnimationEnabled)
return NaN
// !musicElementRepeater.itemAt(index - 1) acts as a fallback condition when there is no previous element present. It happens when Qt clears the model internally.
if(isDefaultClef || !musicElementRepeater.itemAt(index - 1))
return 0
else if(musicElementRepeater.itemAt(index - 1).elementType === "clef") {
if(centerNotesPosition)
return sharpShiftDistance + defaultXPosition + multipleStaff.firstCenteredNotePosition
else
return sharpShiftDistance + defaultXPosition + 10
}
else
return sharpShiftDistance + defaultXPosition + multipleStaff.spaceBetweenNotes
}
onYChanged: {
if(noteAnimationEnabled && elementType === "note")
noteAnimation.start()
}
y: {
if(elementType === "clef")
return flickableTopMargin + staves.itemAt(staffNb).y
else if(noteDetails === undefined || staves.itemAt(staffNb) == undefined)
return 0
var verticalDistanceBetweenLines = staves.itemAt(0).verticalDistanceBetweenLines
var shift = -verticalDistanceBetweenLines / 2
var relativePosition = noteDetails.positionOnStaff
var imageY = flickableTopMargin + staves.itemAt(staffNb).y + 2 * verticalDistanceBetweenLines
if(rotation === 180) {
return imageY - (4 - relativePosition) * verticalDistanceBetweenLines + shift
}
return imageY - (6 - relativePosition) * verticalDistanceBetweenLines + shift
}
NumberAnimation {
id: noteAnimation
target: musicElement
properties: "x"
- duration: 9000
+ duration: noteAnimationDuration
from: multipleStaff.width - 10
to: multipleStaff.clefImageWidth
onStopped: {
noteAnimationFinished()
}
}
}
}
Image {
id: secondStaffDefaultClef
sourceSize.width: musicElementModel.count ? multipleStaff.clefImageWidth : 0
y: staves.count === 2 ? flickableTopMargin + staves.itemAt(1).y : 0
visible: (currentEnteringStaff === 0) && (nbStaves === 2)
source: background.clefType ? "qrc:/gcompris/src/activities/piano_composition/resource/" + background.clefType.toLowerCase() + "Clef.svg"
: ""
}
}
Rectangle {
id: pulseMarker
width: activity.horizontalLayout ? 5 : 3
border.width: width / 2
height: staves.itemAt(0) == undefined ? 0 : 4 * staves.itemAt(0).verticalDistanceBetweenLines + width
opacity: isPulseMarkerDisplayed && pulseMarkerAnimation.running
color: "red"
y: flickableTopMargin
property real nextPosition: 0
NumberAnimation {
id: pulseMarkerAnimation
target: pulseMarker
property: "x"
to: pulseMarker.nextPosition
onStarted: {
if(pulseMarker.height == 0 && staves.count != 0) {
pulseMarker.height = Qt.binding(function() {return 4 * staves.itemAt(0).verticalDistanceBetweenLines + pulseMarker.width;})
}
}
onStopped: {
if(pulseMarker.x === multipleStaff.width)
pulseMarkerAnimationFinished()
else
playDrumSound()
}
}
}
/**
* Initializes the default clefs on the staves.
*
* @param clefType: The clef type to be initialized.
*/
function initClefs(clefType) {
musicElementModel.clear()
musicElementModel.append({ "elementType_": "clef", "clefType_": clefType, "staffNb_": 0, "isDefaultClef_": true,
"noteName_": "", "noteType_": "", "soundPitch_": clefType,
"highlightWhenPlayed_": false })
}
/**
* Pauses the sliding animation of the notes.
*/
function pauseNoteAnimation() {
for(var i = 0; i < musicElementModel.count; i++) {
if(musicElementRepeater.itemAt(i).noteAnimation.running)
musicElementRepeater.itemAt(i).noteAnimation.pause()
}
}
function resumeNoteAnimation() {
for(var i = 0; i < musicElementModel.count; i++) {
musicElementRepeater.itemAt(i).noteAnimation.resume()
}
}
/**
* Gets all the details of any note like note image, position on staff etc. from NoteNotations.
*/
function getNoteDetails(noteName, noteType, clefType) {
var notesDetails = NoteNotations.get()
var noteNotation
if(noteType === "Rest")
noteNotation = noteName + noteType
else
noteNotation = clefType + noteName
for(var i = 0; i < notesDetails.length; i++) {
if(noteNotation === notesDetails[i].noteName) {
return notesDetails[i]
}
}
}
/**
* Adds a note to the staff.
*/
function addMusicElement(elementType, noteName, noteType, highlightWhenPlayed, playAudio, clefType, soundPitch, isUnflicked) {
if(soundPitch == undefined || soundPitch === "")
soundPitch = clefType
var isNextStaff = (selectedIndex == -1) && musicElementModel.count && ((staves.itemAt(0).width - musicElementRepeater.itemAt(musicElementModel.count - 1).x - musicElementRepeater.itemAt(musicElementModel.count - 1).width) < multipleStaff.clefImageWidth)
// If the incoming element is a clef, make sure that there is enough required space to fit one more note too. Else it creates problem when the note is erased and the view is redrawn, else move on to the next staff.
if(elementType === "clef" && musicElementModel.count && (selectedIndex == -1)) {
if(staves.itemAt(0).width - musicElementRepeater.itemAt(musicElementModel.count - 1).x - musicElementRepeater.itemAt(musicElementModel.count - 1).width - 2 * Math.max(multipleStaff.clefImageWidth, musicElementRepeater.itemAt(0).noteImageWidth) < 0)
isNextStaff = true
}
if(isNextStaff && !noteAnimationEnabled) {
multipleStaff.currentEnteringStaff++
if(multipleStaff.currentEnteringStaff >= multipleStaff.nbStaves)
multipleStaff.nbStaves++
// When a new staff is added, initialise it with a default clef.
musicElementModel.append({"noteName_": "", "noteType_": "", "soundPitch_": soundPitch,
"clefType_": clefType, "highlightWhenPlayed_": false,
"staffNb_": multipleStaff.currentEnteringStaff,
"isDefaultClef_": true, "elementType_": "clef"})
if(!isUnflicked)
flickableStaves.flick(0, - nbStaves * multipleStaff.height)
if(elementType === "clef")
return 0
isNextStaff = false
}
if(selectedIndex === -1) {
var isDefaultClef = false
if(!musicElementModel.count)
isDefaultClef = true
musicElementModel.append({"noteName_": noteName, "noteType_": noteType, "soundPitch_": soundPitch,
"clefType_": clefType, "highlightWhenPlayed_": highlightWhenPlayed,
"staffNb_": multipleStaff.currentEnteringStaff,
"isDefaultClef_": isDefaultClef, "elementType_": elementType})
}
else {
var tempModel = createNotesBackup()
var insertingIndex = selectedIndex + 1
if(elementType === "clef")
insertingIndex--
tempModel.splice(insertingIndex, 0, {"elementType_": elementType, "noteName_": noteName, "noteType_": noteType,
"soundPitch_": soundPitch, "clefType_": clefType })
if(elementType === "clef") {
for(var i = 0; i < musicElementModel.count && tempModel[i]["elementType_"] != "clef"; i++)
tempModel[i]["soundPitch_"] = clefType
}
selectedIndex = -1
redraw(tempModel)
}
multipleStaff.selectedIndex = -1
background.clefType = musicElementModel.get(musicElementModel.count - 1).soundPitch_
if(playAudio)
playNoteAudio(noteName, noteType, soundPitch, musicElementRepeater.itemAt(musicElementModel.count - 1).duration)
}
/**
* Creates a backup of the musicElementModel before erasing it.
*
* This backup data is used to redraw the notes.
*/
function createNotesBackup() {
var tempModel = []
for(var i = 0; i < musicElementModel.count; i++)
tempModel.push(JSON.parse(JSON.stringify(musicElementModel.get(i))))
return tempModel
}
/**
* Redraws all the notes on the staves.
*/
function redraw(notes) {
musicElementModel.clear()
currentEnteringStaff = 0
selectedIndex = -1
for(var i = 0; i < notes.length; i++) {
var note = notes[i]
// On load melody from file, the first "note" is the BPM value
if(note.bpm) {
bpmValue = note.bpm;
}
else {
addMusicElement(note["elementType_"], note["noteName_"], note["noteType_"], false, false, note["clefType_"], note["soundPitch_"], true)
}
}
// Remove the remaining unused staffs.
if((multipleStaff.currentEnteringStaff + 1 < multipleStaff.nbStaves) && (multipleStaff.nbStaves > 2)) {
nbStaves = multipleStaff.currentEnteringStaff + 1
flickableStaves.flick(0, - nbStaves * multipleStaff.height)
}
var lastMusicElement = musicElementModel.get(musicElementModel.count - 1)
if(lastMusicElement.isDefaultClef_ && nbStaves > 2) {
musicElementModel.remove(musicElementModel.count - 1)
lastMusicElement = musicElementModel.get(musicElementModel.count - 1)
}
if(lastMusicElement.staffNb_ < nbStaves - 1 && nbStaves != 2)
nbStaves = lastMusicElement.staffNb_ + 1
currentEnteringStaff = lastMusicElement.staffNb_
background.clefType = lastMusicElement.soundPitch_
}
/**
* Erases the selected note.
*
* @param noteIndex: index of the note to be erased
*/
function eraseNote(noteIndex) {
musicElementModel.remove(noteIndex)
selectedIndex = -1
var tempModel = createNotesBackup()
redraw(tempModel)
}
/**
* Erases all the notes.
*/
function eraseAllNotes() {
musicElementModel.clear()
selectedIndex = -1
multipleStaff.currentEnteringStaff = 0
initClefs(background.clefType)
}
readonly property var octave1MidiNumbersTable: {"C":24,"C#":25,"Db":25,"D":26,"D#":27,"Eb":27,"E":28,"F":29,"F#":30,"Gb":30,"G":31,"G#":32,"Ab":32,"A":33,"A#":34,"Bb":34,"B":35}
/**
* Plays audio for a note.
*
* @param noteName: name of the note to be played.
* @param noteType: note type to be played.
*/
function playNoteAudio(noteName, noteType, soundPitch, duration) {
if(noteName) {
if(noteType != "Rest") {
// We should find a corresponding b type enharmonic notation for # type note to play the audio.
if(noteName[1] === "#") {
var blackKeysFlat = piano.blackKeyFlatNoteLabelsArray
var blackKeysSharp = piano.blackKeySharpNoteLabelsArray
for(var i = 0; i < blackKeysSharp.length; i++) {
if(blackKeysSharp[i][0] === noteName) {
noteName = blackKeysFlat[i][0]
break
}
}
}
var octaveNb = ""
var noteCharName = ""
if(noteName[1] == "#" || noteName[1] == "b") {
noteCharName = noteName[0] + noteName[1]
octaveNb = noteName[2]
}
else
{
noteCharName = noteName[0]
octaveNb = noteName[1]
}
var noteMidiName = (octaveNb-1)*12 + octave1MidiNumbersTable[noteCharName];
GSynth.generate(noteMidiName, duration)
}
}
}
/**
* Get all the notes from the musicElementModel and returns the melody.
*/
function getAllNotes() {
var notes = createNotesBackup()
return notes
}
/**
* Loads melody from the provided data, to the staffs.
*
* @param data: melody to be loaded
*/
function loadFromData(data) {
if(data != undefined) {
var melody = data.split(" ")
background.clefType = melody[0]
eraseAllNotes()
for(var i = 1 ; i < melody.length; ++i) {
var noteLength = melody[i].length
var noteName = melody[i][0]
var noteType
if(melody[i].substring(noteLength - 4, noteLength) === "Rest") {
noteName = melody[i].substring(0, noteLength - 4)
noteType = "Rest"
}
else if(melody[i][1] === "#" || melody[i][1] === "b") {
noteType = melody[i].substring(3, melody[i].length)
noteName += melody[i][1] + melody[i][2];
}
else {
noteType = melody[i].substring(2, melody[i].length)
noteName += melody[i][1]
}
addMusicElement("note", noteName, noteType, false, false, melody[0])
}
var tempModel = createNotesBackup()
redraw(tempModel)
}
}
/**
* Used in the activity play_piano.
*
* Checks if the answered note is correct
*/
function indicateAnsweredNote(isCorrectAnswer, noteIndexAnswered) {
musicElementRepeater.itemAt(noteIndexAnswered).noteAnswered = true
musicElementRepeater.itemAt(noteIndexAnswered).isCorrectlyAnswered = isCorrectAnswer
}
/**
* Used in the activity play_piano.
*
* Reverts the previous answer.
*/
function revertAnswer(noteIndexReverting) {
musicElementRepeater.itemAt(noteIndexReverting).noteAnswered = false
}
function play() {
musicTimer.currentNote = 0
selectedIndex = -1
musicTimer.interval = 1
if(isFlickable)
flickableStaves.flick(0, nbStaves * multipleStaff.height)
pulseMarkerAnimation.stop()
if(musicElementModel.count > 1)
pulseMarker.x = musicElementRepeater.itemAt(1).x + musicElementRepeater.itemAt(1).width / 2
else
pulseMarker.x = 0
musicTimer.start()
}
/**
* Stops the audios playing.
*/
function stopAudios() {
musicElementModel.clear()
musicTimer.stop()
items.audioEffects.stop()
}
Timer {
id: musicTimer
property int currentNote: 0
onRunningChanged: {
if(!running && musicElementModel.get(currentNote) !== undefined) {
var currentElement = musicElementModel.get(currentNote)
var currentType = currentElement.noteType_
var note = currentElement.noteName_
var soundPitch = currentElement.soundPitch_
var currentStaff = currentElement.staffNb_
background.clefType = currentElement.clefType_
if(currentElement.isDefaultClef_ && currentStaff > 1) {
flickableStaves.contentY = staves.itemAt(currentStaff - 1).y
}
musicTimer.interval = musicElementRepeater.itemAt(currentNote).duration
if(multipleStaff.enableNotesSound)
playNoteAudio(note, currentType, soundPitch, musicTimer.interval)
pulseMarkerAnimation.stop()
pulseMarkerAnimation.duration = Math.max(1, musicTimer.interval)
if(musicElementRepeater.itemAt(currentNote + 1) != undefined)
pulseMarker.nextPosition = musicElementRepeater.itemAt(currentNote + 1).x + musicElementRepeater.itemAt(currentNote + 1).width / 2
else
pulseMarker.nextPosition = multipleStaff.width
pulseMarkerAnimation.start()
if(!isPulseMarkerDisplayed)
musicElementRepeater.itemAt(currentNote).highlightNote()
currentNote++
musicTimer.start()
}
}
}
}
diff --git a/src/activities/programmingMaze/CodeArea.qml b/src/activities/programmingMaze/CodeArea.qml
index c16ab2434..0214ff71c 100644
--- a/src/activities/programmingMaze/CodeArea.qml
+++ b/src/activities/programmingMaze/CodeArea.qml
@@ -1,343 +1,335 @@
/* GCompris - CodeArea.qml
*
* Copyright (C) 2015 Siddhesh Suthar <siddhesh.it@gmail.com>
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Siddhesh Suthar <siddhesh.it@gmail.com>
* Aman Kumar Gupta <gupta2140@gmail.com>
+ * Timothée Giet <animtim@gcompris.net> (Layout and graphics rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "programmingMaze.js" as Activity
GridView {
id: codeArea
z: 1
width: background.width * 0.4
height: background.height * 0.29
cellWidth: background.buttonWidth
cellHeight: background.buttonHeight
interactive: false
model: currentModel
- clip: true
highlight: Rectangle {
width: buttonWidth
height: buttonHeight
- color: "lightsteelblue"
+ color: "#00ffffff"
border.width: 3.5 * ApplicationInfo.ratio
- border.color: "purple"
- opacity: 0.5
+ border.color: "#e77935"
z: 11
radius: width / 18
}
highlightFollowsCurrentItem: true
- highlightMoveDuration: 500
keyNavigationWraps: true
focus: true
property ListModel currentModel
property int draggedItemIndex: -1
property int possibleDropIndex: -1
property int possibleDropRemoveIndex: -1
property int xCoordinateInPossibleDrop: -1
property int yCoordinateInPossibleDrop: -1
/**
* Stores the index of the item which is clicked to edit.
*
* If the index of the item on 2nd click is same as initialEditItemIndex , then the indicator will become invisible, as it means that initially wanted to edit that instruction, but now we want to deselect it.
*
* If the index of the item on 2nd click is different from initialEditItemIndex, the edit indicator moves to the new item as we now want to edit that one.
*/
property int initialEditItemIndex: -1
// Tells if any instruction is selected for editing.
property bool isEditingInstruction: false
signal spaceKeyPressed
signal tabKeyPressed
signal deleteKeyPressed
/**
* There can be three possibilities here:
*
* 1. We want to insert an instruction at the currentIndex position.
* 2. We want to select an instruction to edit, or deselect it.
* 3. We want to append an instruction.
*/
onSpaceKeyPressed: {
if(currentIndex != -1) {
if(instructionArea.instructionToInsert && (items.numberOfInstructionsAdded < items.maxNumberOfInstructionsAllowed)) {
var isInstructionInserted = appendInstruction()
if(isInstructionInserted)
currentModel.move(currentModel.count - 1, currentIndex, 1)
}
else {
if((initialEditItemIndex == currentIndex) || (initialEditItemIndex == -1 && currentIndex != -1)) {
codeArea.isEditingInstruction = !codeArea.isEditingInstruction
}
-
if(!codeArea.isEditingInstruction)
codeArea.initialEditItemIndex = -1
else
initialEditItemIndex = currentIndex
var calculatedX = (initialEditItemIndex % 4) * codeArea.cellWidth
var calculatedY = Math.floor(initialEditItemIndex / 4) * codeArea.cellHeight
editInstructionIndicator.x = calculatedX + 1.5 * ApplicationInfo.ratio
editInstructionIndicator.y = calculatedY + 1.5 * ApplicationInfo.ratio
}
}
+
else if((items.numberOfInstructionsAdded < items.maxNumberOfInstructionsAllowed) && instructionArea.instructionToInsert)
appendInstruction()
}
onDeleteKeyPressed: {
if(currentIndex != -1) {
currentModel.remove(currentIndex)
items.numberOfInstructionsAdded--
}
resetEditingValues()
}
function appendInstruction() {
if(background.insertIntoMain || (instructionArea.instructionToInsert != "call-procedure")) {
currentModel.append({ "name": instructionArea.instructionToInsert })
items.numberOfInstructionsAdded++
instructionArea.instructionToInsert = ""
return true
}
return false
}
function resetEditingValues() {
initialEditItemIndex = -1
isEditingInstruction = false
}
Item {
id: dropPositionIndicator
visible: false
height: background.buttonHeight
width: 3 * ApplicationInfo.ratio
Rectangle {
visible: parent.visible
anchors.centerIn: parent
width: parent.width
height: parent.height - 3 * ApplicationInfo.ratio
- color: "blue"
- radius: width
+ color: "#e77935"
}
states: [
State {
name: "shown"
when: codeArea.possibleDropIndex != -1
PropertyChanges {
target: dropPositionIndicator
visible: true
x: Math.floor(codeArea.xCoordinateInPossibleDrop / codeArea.cellWidth) *
codeArea.cellWidth - 1.5 * ApplicationInfo.ratio
y: Math.floor(codeArea.yCoordinateInPossibleDrop / codeArea.cellHeight) *
codeArea.cellHeight + 1.5 * ApplicationInfo.ratio
}
}
]
}
Rectangle {
id: editInstructionIndicator
visible: codeArea.isEditingInstruction && codeArea.count != 0
width: background.buttonWidth - 3 * ApplicationInfo.ratio
height: background.buttonHeight - 3 * ApplicationInfo.ratio
color: "red"
- border.color: "black"
+ border.color: "red"
border.width: 1.5 * ApplicationInfo.ratio
opacity: 0.2
radius: width / 18
}
MouseArea {
id: codeAreaMouse
anchors.fill: parent
enabled: items.isTuxMouseAreaEnabled || items.isRunCodeEnabled
onPressed: {
+ codeArea.currentIndex = -1
codeArea.draggedItemIndex = codeArea.indexAt(mouseX,mouseY)
if(codeArea.draggedItemIndex === -1) {
constraintInstruction.changeConstraintInstructionOpacity()
codeArea.isEditingInstruction = false
}
else if(!codeArea.isEditingInstruction)
codeArea.initialEditItemIndex = codeArea.draggedItemIndex
}
onPositionChanged: {
var newPos = codeArea.indexAt(mouseX, mouseY)
var calculatedX = Math.floor(mouseX / codeArea.cellWidth) * codeArea.cellWidth
var previousIndexPosition = codeArea.indexAt(calculatedX - 1, mouseY)
// If the user want to move an item to the end, then the new position will be after the last instruction.
if(newPos == -1 && previousIndexPosition != -1)
newPos = previousIndexPosition + 1
codeArea.isEditingInstruction = false
codeArea.xCoordinateInPossibleDrop = mouseX
codeArea.yCoordinateInPossibleDrop = mouseY
codeArea.possibleDropIndex = newPos
}
onReleased: {
if(codeArea.draggedItemIndex != -1) {
var draggedIndex = codeArea.draggedItemIndex
var dropIndex = codeArea.indexAt(mouseX,mouseY)
var calculatedX = Math.floor(mouseX / codeArea.cellWidth) * codeArea.cellWidth
var calculatedY = Math.floor(mouseY / codeArea.cellHeight) * codeArea.cellHeight
codeArea.draggedItemIndex = -1
if(dropIndex == -1) {
var previousIndexPosition = codeArea.indexAt(calculatedX - 1, mouseY)
if(previousIndexPosition == -1) {
currentModel.remove(draggedIndex)
items.numberOfInstructionsAdded--
}
else {
currentModel.append(currentModel.get(draggedIndex))
currentModel.remove(draggedIndex)
}
codeArea.initialEditItemIndex = -1
}
else if(draggedIndex != dropIndex) {
if(dropIndex <= draggedIndex) {
// Moving instruction from right to left
currentModel.move(draggedIndex, dropIndex, 1)
}
else {
// Moving instruction from left to right
currentModel.move(draggedIndex, dropIndex - 1, 1)
}
codeArea.initialEditItemIndex = -1
}
else {
/**
* If the index of the initially selected instruction (if any) is same as the currently selected instruction,
* deselect it for editing, else make the current instruction as the initially editable item and move the edit indicator to that position.
*/
if(codeArea.initialEditItemIndex == dropIndex) {
codeArea.isEditingInstruction = !codeArea.isEditingInstruction
if(!codeArea.isEditingInstruction)
codeArea.initialEditItemIndex = -1
}
else
codeArea.initialEditItemIndex = draggedIndex
editInstructionIndicator.x = calculatedX + 1.5 * ApplicationInfo.ratio
editInstructionIndicator.y = calculatedY + 1.5 * ApplicationInfo.ratio
}
codeArea.possibleDropIndex = -1
}
}
}
delegate: Item {
id: itemParent
width: background.buttonWidth
height: background.buttonHeight
- Rectangle {
- id: circlePlaceholder
- width: 30 * ApplicationInfo.ratio
- height: width
- radius: width
- anchors.centerIn: parent
- color: "#cecece"
- opacity: 0
- }
-
Item {
id: item
width: background.buttonWidth
height: background.buttonHeight
state: "inactive"
opacity: 1
Behavior on width { NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } }
Behavior on height { NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } }
Behavior on opacity {NumberAnimation { duration: 300; easing.type: Easing.InOutQuad } }
states: [
State {
name: "inDrag"
when: index == codeArea.draggedItemIndex
- PropertyChanges { target: circlePlaceholder; opacity: 1 }
PropertyChanges { target: item; parent: codeArea }
PropertyChanges { target: item; width: background.buttonWidth * 0.80 }
PropertyChanges { target: item; height: background.buttonHeight * 0.80 }
PropertyChanges { target: item; anchors.centerIn: undefined }
PropertyChanges { target: item; x: codeAreaMouse.mouseX - item.width / 2 }
PropertyChanges { target: item; y: codeAreaMouse.mouseY - item.height / 2 }
},
State {
name: "greyedOut"
when: (codeArea.draggedItemIndex != -1) && (codeArea.draggedItemIndex != index)
PropertyChanges { target: item; opacity: 0.7 }
},
State {
name: "inactive"
when: (codeArea.draggedItemIndex == -1) || (codeArea.draggedItemIndex == index)
PropertyChanges { target: item; opacity: 1.0 }
}
]
transitions: [
Transition {
from: "inDrag"
to: "*"
PropertyAnimation {
target: item
properties: "scale, opacity"
from: 0.7
to: 1.0
duration: 200
}
}
]
Rectangle {
width: parent.width - 3 * ApplicationInfo.ratio
height: parent.height - 3 * ApplicationInfo.ratio
border.width: 1.2 * ApplicationInfo.ratio
- border.color: "black"
+ border.color: "#2a2a2a"
anchors.centerIn: parent
radius: width / 18
Image {
id: codeAreaIcon
source: Activity.url + name + ".svg"
- sourceSize { width: parent.width / 1.2; height: parent.height / 1.2 }
+ width: Math.round(parent.width / 1.2)
+ height: Math.round(parent.height / 1.2)
+ sourceSize.width: height
+ sourceSize.height: height
anchors.centerIn: parent
+ fillMode: Image.PreserveAspectFit
+ mipmap: true
}
}
}
}
}
diff --git a/src/activities/programmingMaze/HeaderArea.qml b/src/activities/programmingMaze/HeaderArea.qml
index f74151c01..dcfd9ec32 100644
--- a/src/activities/programmingMaze/HeaderArea.qml
+++ b/src/activities/programmingMaze/HeaderArea.qml
@@ -1,63 +1,58 @@
/* GCompris - HeaderArea.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
+ * Timothée Giet <animtim@gcompris.net> (Layout and graphics rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
Rectangle {
id: header
width: background.width * 0.4
height: background.height / 10
+ radius: 8 * ApplicationInfo.ratio
border.width: 2 * ApplicationInfo.ratio
- border.color: "black"
- color: "transparent"
+ border.color: "#a6d8ea"
+ color: "#ffffff"
+ opacity: headerOpacity
property real headerOpacity
property string headerText
signal clicked
- Image {
- width: parent.width - 2 * parent.border.width
- height: parent.height - 2 * parent.border.width
- anchors.centerIn: parent
- source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW02.svg"
- opacity: header.headerOpacity
-
- GCText {
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- width: parent.width
- height: parent.height
- fontSizeMode: Font.DemiBold
- minimumPointSize: 7
- fontSize: mediumSize
- wrapMode: Text.WordWrap
- color: "white"
- text: header.headerText
- }
+ GCText {
+ horizontalAlignment: Text.AlignHCenter
+ verticalAlignment: Text.AlignVCenter
+ width: parent.width
+ height: parent.height
+ fontSizeMode: Font.DemiBold
+ minimumPointSize: 7
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ color: "#2e2f2f"
+ text: header.headerText
}
MouseArea {
anchors.fill: parent
onClicked: header.clicked()
}
}
diff --git a/src/activities/programmingMaze/InstructionArea.qml b/src/activities/programmingMaze/InstructionArea.qml
index e132727bb..ee3203373 100644
--- a/src/activities/programmingMaze/InstructionArea.qml
+++ b/src/activities/programmingMaze/InstructionArea.qml
@@ -1,182 +1,184 @@
/* GCompris - InstructionArea.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
+ * Timothée Giet <animtim@gcompris.net> (Layout and graphics rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "programmingMaze.js" as Activity
GridView {
id: instructionArea
width: parent.width * 0.5
height: parent.height * 0.17
cellWidth: background.buttonWidth
cellHeight: background.buttonHeight
anchors.left: parent.left
anchors.top: mazeModel.bottom
anchors.topMargin: background.height * 0.4
interactive: false
model: instructionModel
header: HeaderArea {
width: instructionArea.width
height: background.height / 11
headerOpacity: 1
headerText: qsTr("Choose the instructions")
}
property string instructionToInsert
signal spaceKeyPressed
signal tabKeyPressed
onSpaceKeyPressed: {
if(instructionArea.currentIndex != -1)
instructionArea.currentItem.selectCurrentInstruction()
}
onTabKeyPressed: {
instructionArea.currentIndex = -1
background.areaWithKeyboardInput = mainFunctionCodeArea
}
highlight: Rectangle {
width: buttonWidth - 3 * ApplicationInfo.ratio
height: buttonHeight * 1.18 - 3 * ApplicationInfo.ratio
- color: "lightsteelblue"
- border.width: 3.5 * ApplicationInfo.ratio
- border.color: "purple"
+ color: "#00ffffff"
+ border.width: 3.5 * ApplicationInfo.ratio //activity.keyboardNavigationVisible ? 3.5 * ApplicationInfo.ratio : 0
+ border.color: "#e77935"
z: 2
radius: width / 18
- opacity: 0.6
- visible: activity.keyboardNavigationVisible
}
highlightFollowsCurrentItem: true
keyNavigationWraps: true
delegate: Item {
id: instructionItem
width: background.buttonWidth
height: background.buttonHeight * 1.18
Rectangle {
id: imageHolder
width: parent.width - 3 * ApplicationInfo.ratio
height: parent.height - 3 * ApplicationInfo.ratio
border.width: 1.2 * ApplicationInfo.ratio
- border.color: "black"
+ border.color: "#2a2a2a"
anchors.centerIn: parent
radius: width / 18
+ color: instructionArea.instructionToInsert == name ? "#f3bc9a" : "#ffffff"
Image {
id: icon
source: Activity.url + name + ".svg"
- sourceSize {
- width: parent.width / 1.2
- height: parent.height / 1.2
- }
+ width: Math.round(parent.width / 1.2)
+ height: Math.round(parent.height / 1.2)
+ sourceSize.width: height
+ sourceSize.height: height
anchors.centerIn: parent
+ fillMode: Image.PreserveAspectFit
+ mipmap: true
}
}
MouseArea {
id: mouseArea
anchors.fill: parent
enabled: (items.isTuxMouseAreaEnabled || items.isRunCodeEnabled) && ((items.numberOfInstructionsAdded < items.maxNumberOfInstructionsAllowed) || procedureCodeArea.isEditingInstruction || mainFunctionCodeArea.isEditingInstruction)
onPressed: instructionItem.checkModelAndInsert()
}
function selectCurrentInstruction() {
if(!mainFunctionCodeArea.isEditingInstruction && !procedureCodeArea.isEditingInstruction) {
instructionArea.instructionToInsert = name
playClickedAnimation()
}
else {
if(mainFunctionCodeArea.isEditingInstruction)
insertIntoModel(mainFunctionModel, mainFunctionCodeArea)
if(procedureCodeArea.isEditingInstruction && (name != Activity.CALL_PROCEDURE))
insertIntoModel(procedureModel, procedureCodeArea)
}
}
function checkModelAndInsert() {
if(items.constraintInstruction.opacity)
items.constraintInstruction.hide()
if(!background.insertIntoMain && (name != Activity.CALL_PROCEDURE))
insertIntoModel(procedureModel, procedureCodeArea)
else if(background.insertIntoMain)
insertIntoModel(mainFunctionModel, mainFunctionCodeArea)
}
/**
* If we are adding an instruction, append it to the model if number of instructions added is less than the maximum number of instructions allowed.
* If editing, replace it with the selected instruction in the code area.
*/
function insertIntoModel(model, area) {
if(!area.isEditingInstruction) {
if(items.numberOfInstructionsAdded >= items.maxNumberOfInstructionsAllowed)
constraintInstruction.changeConstraintInstructionOpacity()
else {
playClickedAnimation()
model.append({ "name": name })
items.numberOfInstructionsAdded++
}
}
else {
playClickedAnimation()
model.set(area.initialEditItemIndex, {"name": name}, 1)
area.resetEditingValues()
}
}
/**
* If two successive clicks on the same icon are made very fast, stop the ongoing animation and set the scale back to 1.
* Then start the animation for next click.
* This gives proper feedback of multiple clicks.
*/
function playClickedAnimation() {
clickedAnimation.stop()
icon.scale = 1
clickedAnimation.start()
}
SequentialAnimation {
id: clickedAnimation
PropertyAnimation {
target: imageHolder
property: "scale"
to: 0.8
duration: 150
}
PropertyAnimation {
target: imageHolder
property: "scale"
to: 1
duration: 150
}
}
}
}
diff --git a/src/activities/programmingMaze/ProgrammingMaze.qml b/src/activities/programmingMaze/ProgrammingMaze.qml
index 50027540c..4e5c873d0 100644
--- a/src/activities/programmingMaze/ProgrammingMaze.qml
+++ b/src/activities/programmingMaze/ProgrammingMaze.qml
@@ -1,410 +1,424 @@
/* GCompris - ProgrammingMaze.qml
*
* Copyright (C) 2015 Siddhesh Suthar <siddhesh.it@gmail.com>
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Siddhesh Suthar <siddhesh.it@gmail.com>
* Aman Kumar Gupta <gupta2140@gmail.com>
+ * Timothée Giet <animtim@gcompris.net> (Layout and graphics rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "programmingMaze.js" as Activity
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
property int oldWidth: width
onWidthChanged: {
Activity.repositionObjectsOnWidthChanged(width / oldWidth)
oldWidth = width
}
property int oldHeight: height
onHeightChanged: {
Activity.repositionObjectsOnHeightChanged(height / oldHeight)
oldHeight = height
}
property bool keyboardNavigationVisible: false
property string mode: "basic"
property string datasetUrl: "qrc:/gcompris/src/activities/programmingMaze/Dataset.qml"
pageComponent: Image {
id: background
- source: "qrc:/gcompris/src/activities/programmingMaze/resource/background.svg"
+ source: "qrc:/gcompris/src/activities/programmingMaze/resource/background-pm.svg"
fillMode: Image.PreserveAspectCrop
sourceSize.width: parent.width
signal start
signal stop
property bool insertIntoMain: true
property alias items: items
property int buttonWidth: background.width / 10
property int buttonHeight: background.height / 15.3
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property GCSfx audioEffects: activity.audioEffects
property alias mazeModel: mazeModel
property alias instructionModel: instructionModel
property alias mainFunctionModel: mainFunctionModel
property alias mainFunctionCodeArea: mainFunctionCodeArea
property alias procedureModel: procedureModel
property alias procedureCodeArea: procedureCodeArea
property alias instructionArea: instructionArea
property alias player: player
property alias constraintInstruction: constraintInstruction
property alias tutorialImage: tutorialImage
property alias fish: fish
property alias dataset: dataset
property bool isRunCodeEnabled: true
property bool isTuxMouseAreaEnabled: false
property bool currentLevelContainsProcedure
property int maxNumberOfInstructionsAllowed
property int numberOfInstructionsAdded
}
// This function catches the signal emitted after completion of movement of Tux after executing each instruction.
function checkSuccessAndExecuteNextInstruction() {
Activity.checkSuccessAndExecuteNextInstruction()
}
// This function catches the signal emitted after finding a dead-end in any of the executing instruction.
function deadEnd() {
Activity.deadEnd()
}
Loader {
id: dataset
}
onStart: { Activity.start(items, mode, datasetUrl) }
onStop: { Activity.stop() }
property var areaWithKeyboardInput: instructionArea
onAreaWithKeyboardInputChanged: activeCodeAreaIndicator.changeActiveCodeAreaIndicator(areaWithKeyboardInput)
Keys.enabled: items.isTuxMouseAreaEnabled || items.isRunCodeEnabled
Keys.onPressed: {
activity.keyboardNavigationVisible = true
if(event.key === Qt.Key_Left)
areaWithKeyboardInput.moveCurrentIndexLeft()
if(event.key === Qt.Key_Right)
areaWithKeyboardInput.moveCurrentIndexRight()
if(event.key === Qt.Key_Up)
areaWithKeyboardInput.moveCurrentIndexUp()
if(event.key === Qt.Key_Down)
areaWithKeyboardInput.moveCurrentIndexDown()
if(event.key === Qt.Key_Space)
areaWithKeyboardInput.spaceKeyPressed()
if(event.key === Qt.Key_Enter || event.key === Qt.Key_Return)
runCodeOrResetTux()
if(event.key === Qt.Key_Tab)
areaWithKeyboardInput.tabKeyPressed()
if(event.key === Qt.Key_Delete && activeCodeAreaIndicator.top != instructionArea.top) {
areaWithKeyboardInput.deleteKeyPressed()
}
}
function runCodeOrResetTux() {
if(!Activity.deadEndPoint)
runCodeMouseArea.executeCode()
else
Activity.initLevel()
}
ListModel {
id: instructionModel
}
ListModel {
id: mainFunctionModel
}
ListModel {
id: procedureModel
}
Rectangle {
id: constraintInstruction
anchors.left: parent.left
- anchors.bottom: runCode.top
+ anchors.top: instructionArea.bottom
+ anchors.topMargin: 5 * ApplicationInfo.ratio
width: parent.width / 2.3
height: parent.height / 8.9
radius: 10
z: 3
color: "#E8E8E8" //paper white
border.width: 3 * ApplicationInfo.ratio
border.color: "#87A6DD" //light blue
Behavior on opacity { PropertyAnimation { duration: 200 } }
function changeConstraintInstructionOpacity() {
if(opacity)
constraintInstruction.hide()
else
constraintInstruction.show()
}
function show() {
if(instructionText.text)
opacity = 0.8
}
function hide() {
opacity = 0
}
GCText {
id: instructionText
anchors.fill: parent
anchors.margins: parent.border.width
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
fontSizeMode: Text.Fit
wrapMode: Text.WordWrap
readonly property string resetTuxInstructionText: qsTr("Click on Tux or press Enter key to reset it or RELOAD button to reload the level.")
readonly property string constraintInstructionText: qsTr("Reach the fish in less than %1 instructions.").arg(items.maxNumberOfInstructionsAllowed + 1)
text: items.isTuxMouseAreaEnabled ? resetTuxInstructionText : constraintInstructionText
}
}
MouseArea {
anchors.fill: parent
onClicked: constraintInstruction.changeConstraintInstructionOpacity()
}
Repeater {
id: mazeModel
anchors.left: parent.left
anchors.top: parent.top
Image {
x: modelData.x * width
y: modelData.y * height
width: background.width / 10
height: (background.height - background.height / 10) / 10
- source: Activity.reverseCountUrl + "iceblock.svg"
+ source: Activity.reverseCountUrl + "ice-block.svg"
}
}
Image {
id: fish
sourceSize.width: background.width / 12
- source: Activity.reverseCountUrl + "blue-fish.svg"
+ source: Activity.reverseCountUrl + "fish-blue.svg"
}
Image {
id: player
source: "qrc:/gcompris/src/activities/maze/resource/tux_top_south.svg"
- sourceSize.width: background.width / 12
+ width: background.width / 12
+ sourceSize.width: width
z: 1
property int duration: 1000
readonly property real playerCenterX: x + width / 2
readonly property real playerCenterY: y + height / 2
MouseArea {
id: tuxMouseArea
anchors.fill: parent
enabled: items.isTuxMouseAreaEnabled
onClicked: {
Activity.initLevel()
}
}
}
Rectangle {
id: activeCodeAreaIndicator
+ color: "#1dade4"
opacity: 0.5
+ radius: 8 * ApplicationInfo.ratio
visible: activity.keyboardNavigationVisible
+ border.width: 2 * ApplicationInfo.ratio
+ border.color: "white"
function changeActiveCodeAreaIndicator(activeArea) {
anchors.top = activeArea.top
anchors.fill = activeArea
}
}
InstructionArea {
id: instructionArea
}
HeaderArea {
id: mainFunctionHeader
headerText: qsTr("Main function")
headerOpacity: background.insertIntoMain ? 1 : 0.5
onClicked: background.insertIntoMain = true
anchors.top: parent.top
anchors.right: parent.right
}
CodeArea {
id: mainFunctionCodeArea
currentModel: mainFunctionModel
anchors.right: parent.right
anchors.top: mainFunctionHeader.bottom
onTabKeyPressed: {
mainFunctionCodeArea.currentIndex = -1
if(!items.currentLevelContainsProcedure) {
background.areaWithKeyboardInput = instructionArea
instructionArea.currentIndex = 0
}
else {
background.areaWithKeyboardInput = procedureCodeArea
background.insertIntoMain = false
}
}
}
HeaderArea {
id: procedureHeader
headerText: qsTr("Procedure")
headerOpacity: !background.insertIntoMain ? 1 : 0.5
visible: procedureCodeArea.visible
onClicked: background.insertIntoMain = false
anchors.top: mainFunctionCodeArea.bottom
anchors.right: parent.right
}
CodeArea {
id: procedureCodeArea
currentModel: procedureModel
anchors.right: parent.right
anchors.top: procedureHeader.bottom
visible: items.currentLevelContainsProcedure
property alias procedureIterator: procedureCodeArea.currentIndex
onTabKeyPressed: {
procedureCodeArea.currentIndex = -1
background.areaWithKeyboardInput = instructionArea
instructionArea.currentIndex = 0
background.insertIntoMain = true
}
}
- Image {
- id: runCode
- width: background.width / 10
- height: background.height / 10
- anchors.right: instructionArea.right
- anchors.bottom: bar.top
- anchors.margins: 10 * ApplicationInfo.ratio
-
- source:"qrc:/gcompris/src/core/resource/bar_ok.svg"
- fillMode: Image.PreserveAspectFit
-
- MouseArea {
- id: runCodeMouseArea
- anchors.fill: parent
- hoverEnabled: ApplicationInfo.isMobile ? false : (!items.isRunCodeEnabled ? false : true)
- enabled: items.isRunCodeEnabled
-
- signal executeCode
+ Item {
+ id: runCodeLayout
+ height: constraintInstruction.height
+ anchors.left: constraintInstruction.right
+ anchors.right: mainFunctionCodeArea.left
+ anchors.verticalCenter: constraintInstruction.verticalCenter
- onEntered: runCode.scale = 1.1
- onExecuteCode: {
- if(mainFunctionModel.count)
- startCodeExecution()
+ Image {
+ id: runCode
+ height: Math.min(parent.width, parent.height)
+ width: height
+ sourceSize.width: height
+ sourceSize.height: height
+ anchors.centerIn: parent
+ source:"qrc:/gcompris/src/core/resource/bar_ok.svg"
+ fillMode: Image.PreserveAspectFit
+
+ MouseArea {
+ id: runCodeMouseArea
+ anchors.fill: parent
+ hoverEnabled: ApplicationInfo.isMobile ? false : (!items.isRunCodeEnabled ? false : true)
+ enabled: items.isRunCodeEnabled
+
+ signal executeCode
+
+ onEntered: runCode.scale = 1.1
+ onExecuteCode: {
+ if(mainFunctionModel.count)
+ startCodeExecution()
+ }
+ onClicked: executeCode()
+ onExited: runCode.scale = 1
+
+ function startCodeExecution() {
+ runCodeClickAnimation.start()
+ Activity.resetCodeAreasIndices()
+
+ if(constraintInstruction.opacity)
+ constraintInstruction.hide()
+
+ Activity.runCode()
+ }
}
- onClicked: executeCode()
- onExited: runCode.scale = 1
-
- function startCodeExecution() {
- runCodeClickAnimation.start()
- Activity.resetCodeAreasIndices()
- if(constraintInstruction.opacity)
- constraintInstruction.hide()
-
- Activity.runCode()
+ SequentialAnimation {
+ id: runCodeClickAnimation
+ NumberAnimation { target: runCode; property: "scale"; to: 0.8; duration: 100 }
+ NumberAnimation { target: runCode; property: "scale"; to: 1.0; duration: 100 }
}
}
-
- SequentialAnimation {
- id: runCodeClickAnimation
- NumberAnimation { target: runCode; property: "scale"; to: 0.8; duration: 100 }
- NumberAnimation { target: runCode; property: "scale"; to: 1.0; duration: 100 }
- }
}
Image {
id: tutorialImage
source: "qrc:/gcompris/src/activities/guesscount/resource/backgroundW01.svg"
anchors.fill: parent
z: 5
visible: true
property bool shownProcedureTutorialInstructions: false
Tutorial {
id:tutorialSection
tutorialDetails: bar.level <= 2 ? Activity.mainTutorialInstructions : Activity.procedureTutorialInstructions
onSkipPressed: {
Activity.initLevel()
tutorialImage.visible = false
tutorialNumber = 0
}
}
onVisibleChanged: {
if(tutorialImage.visible && tutorialImage.shownProcedureTutorialInstructions)
tutorialSection.visible = true
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: tutorialImage.visible ? help | home : help | home | level | reload }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onReloadClicked: Activity.reloadLevel()
}
Bonus {
id: bonus
Component.onCompleted: win.connect(Activity.nextLevel)
}
}
}
diff --git a/src/activities/programmingMaze/programmingMaze.js b/src/activities/programmingMaze/programmingMaze.js
index 3bd69fec4..aa774f72c 100644
--- a/src/activities/programmingMaze/programmingMaze.js
+++ b/src/activities/programmingMaze/programmingMaze.js
@@ -1,358 +1,352 @@
/* GCompris - programmingMaze.js
*
* Copyright (C) 2015 Siddhesh Suthar <siddhesh.it@gmail.com>
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Siddhesh Suthar <siddhesh.it@gmail.com>
* Aman Kumar Gupta <gupta2140@gmail.com>
+ * Timothée Giet <animtim@gcompris.net> (Layout and graphics rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris //for ApplicationInfo
// possible instructions
var MOVE_FORWARD = "move-forward"
var TURN_LEFT = "turn-left"
var TURN_RIGHT = "turn-right"
var CALL_PROCEDURE = "call-procedure"
var mazeBlocks
// Length of 1 step along x-axis
var stepX
// Length of 1 step along y-axis
var stepY
/**
* Lookup tables of instruction objects for main and procedure areas which will be stored here on creation and can be
* accessed when required to execute.
*/
var mainInstructionObjects = []
var procedureInstructionObjects = []
// New rotation of Tux on turning.
var changedRotation
// Indicates if there is a dead-end
var deadEndPoint = false
// Stores the index of mainInstructionObjects[] which is going to be processed
var codeIterator = 0
/**
* Stores if the reset is done only when Tux is clicked.
*
* If resetTux is true, initLevel() is called and the instruction areas are not cleared.
*
* Else, it means that initLevel() is called to reset the entire level and the instruction areas are cleared as well.
*/
var resetTux = false
-// Duration of movement of highlight in the execution area.
-var moveAnimDuration
-
//Stores the currrent instruction which is going to be processed
var currentInstruction
var url = "qrc:/gcompris/src/activities/programmingMaze/resource/"
var reverseCountUrl = "qrc:/gcompris/src/activities/reversecount/resource/"
var currentLevel = 0
var numberOfLevel
var items
var NORTH = 0
var WEST = 90
var SOUTH = 180
var EAST = 270
/**
* Stores the qml file components of all the instructions used in the activity.
*
* To add a new instruction, add its component here and add the instruction name in "instructionList" inside createInstructionObjects() along with the other instructions.
*/
var instructionComponents = {
"move-forward": Qt.createComponent(url + "instructions/MoveForward.qml"),
"turn-left": Qt.createComponent(url + "instructions/TurnLeftOrRight.qml"),
"turn-right": Qt.createComponent(url + "instructions/TurnLeftOrRight.qml"),
"call-procedure": Qt.createComponent(url + "instructions/Procedure.qml")
}
var mainTutorialInstructions = [
{
- "instruction": qsTr("<b><h7>Instruction Area:</b></h7>" +
+ "instruction": qsTr("<b><h7>Instruction Area:</h7></b>" +
"There are 3 instructions which you have to use to code and make Tux reach the fish:" +
- "<b><li>1. Move forward:</b> Moves Tux one step forward in the direction it is facing.</li>" +
- "<b><li>2. Turn left:</b> Turns Tux in the left direction from where it is facing.</li>" +
- "<b><li>3. Turn right:</b> Turns Tux in the right direction from where it is facing.</li>"),
+ "<li><b>1. Move forward:</b> Moves Tux one step forward in the direction it is facing.</li>" +
+ "<li><b>2. Turn left:</b> Turns Tux in the left direction from where it is facing.</li>" +
+ "<li><b>3. Turn right:</b> Turns Tux in the right direction from where it is facing.</li>"),
"instructionImage": "qrc:/gcompris/src/activities/programmingMaze/resource/tutorial1.png"
},
{
- "instruction": qsTr("<b><h7>Main Function:</b></h7>" +
+ "instruction": qsTr("<b><h7>Main Function:</h7></b>" +
"<li>-The execution of code starts here on running.</li>" +
"<li>-Click on any instruction in the <b>instruction area</b> to add them to the <b>Main Function</b></li>" +
"<li>-The instructions will execute in order until there's none left, dead-end or Tux reaches the fish.</li>"),
"instructionImage": "qrc:/gcompris/src/activities/programmingMaze/resource/tutorial2.png"
},
]
var procedureTutorialInstructions = [
{
- "instruction": qsTr("<b><h7>Procedure:</b></h7>" +
+ "instruction": qsTr("<b><h7>Procedure:</h7></b>" +
"<li>-<b>Procedure</b> is a reusable set of instructions which can be <b>used in a code by calling it where needed.</b></li>" +
"<li>-To <b>switch</b> between the <b>Procedure area</b> and <b>Main Function area</b> to add your code, click on the label <b>Procedure</b> or <b>Main Function</b>.</li>"),
"instructionImage": "qrc:/gcompris/src/activities/programmingMaze/resource/tutorial3.png"
},
]
// Mode of the activity: basic or loop
var activityMode
function start(items_, mode_, datasetUrl_) {
items = items_
items.dataset.source = datasetUrl_
activityMode = mode_
currentLevel = 0
mazeBlocks = items.dataset.item.levels
numberOfLevel = mazeBlocks.length
resetTux = false
initLevel()
}
function stop() {
destroyInstructionObjects()
}
/**
* This function creates and populate instruction objects for main as well as procedure area.
*
* These are stored in the lookup table, provided in the parameter as "instructionObjects".
* The instructions are then connected to the slots of their code area (main or procedure), provided as "instructionCodeArea" in the parameter.
*
* The instructions can now be obtained from the look-up tables and executed when called.
*
* This saves the process of re-creating all the instruction objets, connecting them to their parent's slot and destroying
* them everytime for each instruction call which will be very redundant and quite memory consuming on devices with
* less RAM, weak processing power and slow performance specially for "loops" mode.
*
* Hence these look-up table objects will be created and destroyed only once in each level (depending on the need) and can be accessed when needed.
*/
function createInstructionObjects(instructionObjects, instructionCodeArea) {
var instructionList = [MOVE_FORWARD, TURN_LEFT, TURN_RIGHT]
for(var i = 0; i < instructionList.length; i++)
createInstruction(instructionObjects, instructionList[i], instructionCodeArea)
}
function createInstruction(instructionObjects, instructionName, instructionCodeArea) {
if(instructionName == TURN_LEFT || instructionName == TURN_RIGHT)
instructionObjects[instructionName] = instructionComponents[instructionName].createObject(instructionCodeArea, { "turnDirection": instructionName })
else
instructionObjects[instructionName] = instructionComponents[instructionName].createObject(instructionCodeArea)
instructionObjects[instructionName].foundDeadEnd.connect(instructionCodeArea.deadEnd)
instructionObjects[instructionName].executionComplete.connect(instructionCodeArea.checkSuccessAndExecuteNextInstruction)
}
// Destroy instruction objects from the look-up tables
function destroyInstructionObjects() {
var instructionList = Object.keys(mainInstructionObjects)
for(var i = 0; i < instructionList.length; i++)
mainInstructionObjects[instructionList[i]].destroy()
instructionList = Object.keys(procedureInstructionObjects)
for(var i = 0; i < instructionList.length; i++)
procedureInstructionObjects[instructionList[i]].destroy()
mainInstructionObjects = []
procedureInstructionObjects = []
}
function initLevel() {
if(!items || !items.bar)
return
items.bar.level = currentLevel + 1
destroyInstructionObjects()
var levelInstructions = mazeBlocks[currentLevel].instructions
if(levelInstructions.indexOf(CALL_PROCEDURE) != -1)
items.currentLevelContainsProcedure = true
else
items.currentLevelContainsProcedure = false
// Create, populate and connect signals of instructions for main function code area and store them in mainInstructionObjects.
createInstructionObjects(mainInstructionObjects, items.background)
if(items.currentLevelContainsProcedure) {
if(!items.tutorialImage.shownProcedureTutorialInstructions) {
items.tutorialImage.shownProcedureTutorialInstructions = true
items.tutorialImage.visible = true
}
// Create procedure object in the main look-up table ,if the level has procedure/loop, to execute it for procedure/loop calls from the main code area.
createInstruction(mainInstructionObjects, CALL_PROCEDURE, items.background)
// Create, populate and connect signals of instructions for procedure code area if the level has procedure/loop.
createInstructionObjects(procedureInstructionObjects, mainInstructionObjects[CALL_PROCEDURE])
}
// Stores the co-ordinates of the tile blocks in the current level
var currentLevelBlocksCoordinates = mazeBlocks[currentLevel].map
items.mazeModel.model = currentLevelBlocksCoordinates
if(!resetTux) {
items.mainFunctionModel.clear()
items.procedureModel.clear()
items.numberOfInstructionsAdded = 0
}
stepX = items.mazeModel.itemAt(0).width
stepY = items.mazeModel.itemAt(0).height
items.instructionModel.clear()
for (var i = 0; i < levelInstructions.length; i++)
items.instructionModel.append({"name":levelInstructions[i]})
// Center Tux in its first case
items.player.x = currentLevelBlocksCoordinates[0].x * stepX + (stepX - items.player.width) / 2
items.player.y = currentLevelBlocksCoordinates[0].y * stepY + (stepY - items.player.height) / 2
items.player.rotation = EAST
// Center fish at it's co-ordinate
items.fish.x = mazeBlocks[currentLevel].fish.x * stepX + (stepX - items.fish.width) / 2
items.fish.y = mazeBlocks[currentLevel].fish.y * stepY + (stepY - items.fish.height) / 2
changedRotation = EAST
deadEndPoint = false
- moveAnimDuration = 1000
- items.background.insertIntoMain = true
- items.mainFunctionCodeArea.highlightMoveDuration = moveAnimDuration / 2
- items.procedureCodeArea.highlightMoveDuration = moveAnimDuration / 2
items.isTuxMouseAreaEnabled = false
items.isRunCodeEnabled = true
items.maxNumberOfInstructionsAllowed = mazeBlocks[currentLevel].maxNumberOfInstructions
items.constraintInstruction.show()
items.mainFunctionCodeArea.resetEditingValues()
items.procedureCodeArea.resetEditingValues()
items.background.areaWithKeyboardInput = items.instructionArea
resetCodeAreasIndices()
resetTux = false
codeIterator = 0
}
function resetCodeAreasIndices() {
items.instructionArea.currentIndex = -1
items.mainFunctionCodeArea.currentIndex = -1
items.procedureCodeArea.currentIndex = -1
items.instructionArea.instructionToInsert = ''
}
function getPlayerRotation() {
return ((changedRotation % 360) + 360) % 360
}
function runCode() {
items.mainFunctionCodeArea.resetEditingValues()
items.procedureCodeArea.resetEditingValues()
var instructionName
// Append all the procedure instructions to the procedure area object.
for(var j = 0; j < items.procedureModel.count; j++) {
instructionName = items.procedureModel.get(j).name
mainInstructionObjects[CALL_PROCEDURE].procedureCode.append({ "name" : instructionName })
}
items.isRunCodeEnabled = false
if(items.mainFunctionModel.count > 0)
executeNextInstruction()
else
deadEnd()
}
function executeNextInstruction() {
if((codeIterator < items.mainFunctionModel.count) && !deadEndPoint) {
items.mainFunctionCodeArea.currentIndex += 1
var instructionToExecute = items.mainFunctionModel.get(codeIterator).name
mainInstructionObjects[instructionToExecute].checkAndExecuteMovement()
}
}
function deadEnd() {
deadEndPoint = true
resetTux = true
items.isTuxMouseAreaEnabled = true
items.constraintInstruction.show()
items.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/brick.wav")
items.bonus.bad("tux")
}
function checkSuccessAndExecuteNextInstruction() {
var fishX = mazeBlocks[currentLevel].fish.x
var fishY = mazeBlocks[currentLevel].fish.y
var tuxX = Math.floor(items.player.playerCenterX / stepX)
var tuxY = Math.floor(items.player.playerCenterY / stepY)
if(tuxX === fishX && tuxY === fishY) {
codeIterator = 0
items.bonus.good("tux")
}
else if(codeIterator === (items.mainFunctionModel.count - 1)) {
deadEnd()
}
else {
codeIterator++
executeNextInstruction()
}
}
function nextLevel() {
resetTux = false
if(numberOfLevel <= ++currentLevel) {
currentLevel = 0
}
initLevel();
}
function previousLevel() {
resetTux = false
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
initLevel();
}
function repositionObjectsOnWidthChanged(factor) {
resetTux = true
if(items)
initLevel()
}
function repositionObjectsOnHeightChanged(factor) {
resetTux = true
if(items)
initLevel()
}
function reloadLevel() {
resetTux = false
initLevel()
}
diff --git a/src/activities/programmingMaze/programmingMaze.svg b/src/activities/programmingMaze/programmingMaze.svg
index b3dd8b1d1..008421d88 100644
--- a/src/activities/programmingMaze/programmingMaze.svg
+++ b/src/activities/programmingMaze/programmingMaze.svg
@@ -1,146 +1,435 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
id="svg11539"
sodipodi:version="0.32"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
version="1.0"
- sodipodi:docname="maze.svg">
+ sodipodi:docname="programmingMaze.svg">
<defs
- id="defs11541" />
+ id="defs11541">
+ <linearGradient
+ gradientTransform="matrix(1,0,0,1.0859179,0,-53.897354)"
+ gradientUnits="userSpaceOnUse"
+ y2="650.04968"
+ x2="945.6795"
+ y1="637.41199"
+ x1="940.9632"
+ id="linearGradient4503"
+ xlink:href="#linearGradient4497"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient4497"
+ inkscape:collect="always">
+ <stop
+ id="stop4499"
+ offset="0"
+ style="stop-color:#275eb1;stop-opacity:1" />
+ <stop
+ id="stop4501"
+ offset="1"
+ style="stop-color:#e6ecf9;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(-1,0,0,1.0859179,1919.9978,-53.897354)"
+ gradientUnits="userSpaceOnUse"
+ y2="650.04968"
+ x2="945.6795"
+ y1="637.41199"
+ x1="940.9632"
+ id="linearGradient4503-2"
+ xlink:href="#linearGradient4497"
+ inkscape:collect="always" />
+ </defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.4336259"
- inkscape:cx="42.192442"
- inkscape:cy="42.822063"
+ inkscape:zoom="3.4416668"
+ inkscape:cx="19.882369"
+ inkscape:cy="36.429811"
inkscape:document-units="px"
inkscape:current-layer="layer1"
height="100px"
width="100px"
- inkscape:window-width="1880"
- inkscape:window-height="1060"
- inkscape:window-x="-3"
- inkscape:window-y="-3"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
showgrid="false"
- inkscape:window-maximized="1" />
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false" />
<metadata
id="metadata11544">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
- <rect
- style="opacity:1;fill:#e3dedb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect12366"
- width="70.903809"
- height="68.383514"
- x="14.691938"
- y="25.686052" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 19.445229,24.237198 -3.532499,0.340482 -3.341554,0.885253 -0.238682,2.406072 3.723446,-0.136192 0,0.0454 4.296282,-0.0681 6.51603,0.0454 3.79505,0 -0.0716,4.789446 0.238683,4.335469 -0.214815,4.471663 -0.0716,0 0.190946,1.974795 -0.07161,1.566218 0.07161,0 0,0.0681 1.76625,-0.249687 1.599172,-0.0681 0.02387,-0.885253 0.262551,-0.0454 -0.190946,-1.770506 0,-0.158892 -0.02387,0 -0.334156,-3.041638 0.358024,-6.174073 -0.859257,-8.148868 -5.227145,0.272386 -8.664171,-0.453976 z m -3.508631,16.910603 -1.76625,0.249686 -1.599172,0.0681 -0.02387,0.885253 -0.26255,0.0454 0.190946,1.770506 0,0.158891 0.02387,0 0.334155,3.041639 -0.358024,6.174072 0.859257,8.148868 5.227144,-0.272385 8.664172,0.453975 3.532499,-0.340482 3.341554,-0.885252 0.238682,-2.406073 -3.723446,0.136193 0,-0.0454 -4.296283,0.0681 -6.516029,-0.0454 -3.79505,0 0.0716,-4.789446 -0.238682,-4.335471 0.214814,-4.471662 0.04774,0 -0.190946,-2.791953 0.0716,-0.749059 -0.04774,0 0,-0.0681 z"
- id="path10698"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 38.852674,24.360439 -3.532499,0.415659 -3.341554,1.013168 -0.262551,3.299291 3.460895,-0.545551 0,-0.103915 0.739915,0 0.262551,-0.05196 6.945658,-0.389681 9.953056,0.311745 -0.334154,-3.74093 -5.227145,0.311744 -8.664172,-0.519573 z"
- id="path10811"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 21.211479,58.87556 -5.82385,0.363181 -2.935794,0.612868 0.54897,4.971036 -0.358024,6.174073 0.596706,5.652 -0.167078,0.0454 0.54897,4.971037 -0.358024,6.174072 0.859257,8.148868 5.227144,-0.272386 8.664172,0.453981 3.532499,-0.340486 1.408226,-0.363182 0.190946,0.817158 5.227145,-0.522073 6.492161,0.340483 5.943192,-0.567471 0.04774,0.158892 5.227145,-0.522073 6.492161,0.340482 8.568698,-0.817157 -0.286418,-4.971036 0.477365,-8.239663 -0.358024,-3.359421 -0.930862,-3.177832 -2.530033,-0.226988 0.143209,3.541013 -0.04774,0 0.0716,4.085782 -0.04774,6.196772 0,3.609109 -5.036199,-0.0681 -1.646909,0.09079 -0.143209,0.658266 -5.227144,-0.544772 -5.656773,0.317783 0,0.136193 -5.036199,-0.0681 -4.558835,0.226988 -2.959661,-0.136192 -2.076538,0.136192 -3.532499,-0.249686 -0.358023,0.0227 0,-0.0454 -0.04774,0 -4.248547,0.0681 -6.51603,-0.0454 -3.795049,0 0.0716,-4.789446 -0.09547,-1.566217 -0.692179,-0.136193 0.572838,-4.971036 -0.334156,-5.379615 -0.143209,0 0.0716,-4.789446 -0.238682,-4.335469 0.214814,-4.471664 5.5613,-0.295084 4.773647,0.38588 4.344021,0.0454 0,0.0681 1.766249,-0.249687 1.599172,-0.0681 0.09547,-2.860049 -6.563766,0.0908 -6.587634,-0.453977 z"
- id="path11595"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 54.209579,65.277954 -0.437073,-3.359421 -1.065367,-3.177832 -3.469272,-0.249687 0.573659,3.291326 0.109268,0 0,0.703663 0.05464,0.249687 0.409756,6.605349 -0.327804,9.465398 3.933661,-0.317783 -0.327805,-4.971036 0.546342,-8.239664 z"
- id="path11611"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 58.065439,24.200561 -3.5325,0.415659 -3.341554,1.013168 -0.26255,3.299291 3.460895,-0.545552 0,-0.103914 0.739915,0 0.262551,-0.05196 6.945658,-0.38968 9.953056,0.311744 -0.334155,-3.740929 -5.227145,0.311744 -8.664171,-0.519573 z"
- id="path11613"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 74.071584,24.200561 -3.5325,0.415659 -3.341554,1.013168 -0.26255,3.299291 3.460895,-0.545552 0,-0.103914 0.739916,0 0.26255,-0.05196 6.945658,-0.38968 9.953057,0.311744 -0.334156,-3.740929 -5.227145,0.311744 -8.664171,-0.519573 z"
- id="path11615"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 79.566096,95.802145 5.82385,-0.363181 2.935793,-0.612867 -0.54897,-4.971036 0.358024,-6.174073 -0.596706,-5.652 0.167077,-0.0454 -0.548968,-4.971036 0.358024,-6.174072 -0.859257,-8.148865 -5.227145,0.272386 -8.664171,-0.453975 -3.5325,0.340482 -3.341553,0.885252 -0.238683,2.406073 3.723446,-0.136193 0,0.0454 4.296283,-0.0681 6.51603,0.0454 3.79505,0 -0.07161,4.789443 0.09547,1.566215 0.692179,0.136193 -0.572839,4.971036 0.334156,5.379615 0.143209,0 -0.0716,4.789446 0.238683,4.33547 -0.214815,4.471663 -5.5613,0.295084 -4.773648,-0.385879 -4.34402,-0.0454 0,-0.0681 -1.766249,0.249686 -1.599173,0.0681 -0.09547,2.860049 6.563766,-0.09079 6.587635,0.453976 z"
- id="path11619"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 72.313187,24.461573 -3.5325,0.340482 -3.341553,0.885253 -0.238682,2.406073 3.723446,-0.136193 0,0.0454 4.296282,-0.0681 6.51603,0.0454 3.79505,0 -0.0716,4.789445 0.238683,4.33547 -0.214814,4.471663 -0.07161,0 0.190947,1.974795 -0.07161,1.566217 0.07161,0 0,0.0681 1.766249,-0.249686 1.599172,-0.0681 0.02387,-0.885253 0.262551,-0.0454 -0.190946,-1.770505 0,-0.158893 -0.02387,0 -0.334156,-3.041638 0.358024,-6.174072 -0.859257,-8.148868 -5.227145,0.272386 -8.664171,-0.453976 z m -3.508631,16.910603 -1.76625,0.249687 -1.599172,0.0681 -0.02387,0.885252 -0.262551,0.0454 0.190946,1.770507 0,0.158891 0.02387,0 0.334156,3.041639 -0.358024,6.174073 0.859257,8.148867 5.227145,-0.272385 8.664171,0.453976 3.5325,-0.340482 3.341553,-0.885253 0.238682,-2.406073 -3.723445,0.136193 0,-0.0454 -4.296283,0.0681 -6.51603,-0.0454 -3.79505,0 0.0716,-4.789445 -0.238683,-4.33547 0.214815,-4.471664 0.04774,0 -0.190947,-2.791952 0.07161,-0.749059 -0.04774,0 0,-0.0681 z"
- id="path11621"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 53.895733,49.160637 -0.437073,-3.359422 -1.065366,-3.177831 -3.469272,-0.249686 0.573659,3.291325 0.109268,0 0,0.703662 0.05464,0.249687 0.409756,6.60535 -0.327805,9.465397 3.933661,-0.317782 -0.327805,-4.971037 0.546342,-8.239663 z"
- id="path11623"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 53.581887,35.132602 -0.437075,-3.359421 -1.065365,-3.597878 -3.469273,-0.249687 0.573659,3.711372 0.109269,0 0,0.703662 0.05464,0.249687 0.409756,6.605349 -0.327805,9.465398 3.933662,-0.317783 -0.327805,-4.971036 z"
- id="path11625"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccccc" />
- <path
- style="fill:#b38b56;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 45.695855,79.519147 3.532499,-0.415658 3.341554,-1.013169 0.262551,-3.299292 -3.460895,0.545552 0,0.103915 -0.739916,0 -0.26255,0.05196 -6.945658,0.38968 -9.953057,-0.311744 0.334155,3.740929 5.227145,-0.311744 8.664172,0.519573 z"
- id="path11629"
- inkscape:connector-curvature="0" />
<g
- id="g22156"
- transform="matrix(0.25886021,-0.23597359,0.25896816,0.23587546,11.41168,40.306953)">
- <path
- id="path21267"
- d="M 20.980236,5.9570105 9.9380067,-2.3246617 4.4168919,-5.0852191 l 4.0488175,-5.7051519 7.7295606,-4.232855 8.46571,9.017821 4.600929,4.2328548 8.281672,-6.6253378 2.024409,2.2084459 0.552111,3.4967061 -2.392483,16.011233 -18.403716,1.472297 -4.048818,-2.57652 1.288261,-2.7605574 4.416891,-3.4967061 z"
- style="fill:#f32929;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccccccscccccccccccccccc"
- id="path20377"
- d="M 17.486149,-17.96875 7.734375,-12.357686 -0.54510135,-4.90625 9.5782095,0.06942568 17.125,5.78125 11.40625,11.46875 16.75,17 39.1875,15.34375 42.875,-6 38.65625,-11.15625 c 0,0 -7.177028,6.2396113 -8.833361,6.2396115 -1.656335,0 -12.336739,-13.0521115 -12.33674,-13.0521115 z m -1.298649,5.875 8.843666,10.3195101 4.607685,2.40278719 6.423649,-5.72229729 1.84375,-0.71875 0.9375,2.75 L 38.083361,0.26047297 35.902703,11.670186 26.5,12.78125 19.125,13.125 17.65625,12.03125 23.9375,7.8125 22.09375,2.84375 7.53125,-5.8125 16.1875,-12.09375 Z"
- style="fill:#9a0e0e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ transform="matrix(0.17306643,0,0,0.17306643,-36.673612,-30.052924)"
+ id="layer1-6"
+ inkscape:label="Calque 1">
+ <path
+ sodipodi:nodetypes="csszszcc"
+ inkscape:connector-curvature="0"
+ id="path3775-3"
+ d="m 402.557,627.34124 c 15.45599,-0.1269 60.59179,16.71024 59.13369,23.10393 -0.3799,1.66622 -16.1722,7.30674 -22.2907,10.18897 -3.4918,1.64489 1.6432,6.65255 -1.6045,7.05293 -3.2477,0.40038 -12.1021,-3.21282 -19.2145,-3.70297 -9.1385,-0.62978 -26.50988,1.9625 -30.38541,1.57616 -3.87552,-0.38633 -8.97404,-28.10646 -6.81057,-29.11119 6.42101,-2.95779 16.60439,-8.77075 21.17199,-9.10783 z"
+ style="display:inline;opacity:0.98999999;fill:#a78014;fill-opacity:1;stroke:none" />
+ <path
+ sodipodi:nodetypes="csszszcc"
+ inkscape:connector-curvature="0"
+ id="path3775"
+ d="m 329.45449,627.34203 c -15.45599,-0.1269 -60.59178,16.71024 -59.13375,23.10393 0.37997,1.66622 16.17224,7.30674 22.29073,10.18897 3.49182,1.64489 -1.64324,6.65255 1.60449,7.05293 3.24772,0.40038 12.10216,-3.21282 19.2145,-3.70297 9.13848,-0.62978 26.50991,1.9625 30.38544,1.57616 3.87552,-0.38633 8.97404,-28.10646 6.81057,-29.11119 -6.42101,-2.95779 -16.60435,-8.77075 -21.17198,-9.10783 z"
+ style="display:inline;fill:#a78014;fill-opacity:1;stroke:none" />
+ <g
+ transform="translate(-594.61442,-196.85364)"
+ id="g4667"
+ style="display:inline">
+ <path
+ style="display:inline;fill:#e2a70e;fill-opacity:1;stroke:none"
+ d="m 921.34614,828.77469 c -13.48149,-0.11069 -52.85117,12.57551 -51.57941,18.1524 0.33143,1.45336 14.10624,4.3733 19.44309,6.88733 3.04574,1.43475 0.31118,5.80268 3.14402,6.15192 2.83282,0.34923 8.8116,-2.80239 15.01534,-3.22992 7.97104,-0.54933 25.12326,1.9673 28.5037,1.63031 3.38042,-0.33698 3.8276,-22.77136 1.94051,-23.64774 -5.60072,-2.57993 -12.48314,-5.65028 -16.46725,-5.9443 z"
+ id="path3775-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csszszcc" />
+ <path
+ style="display:inline;fill:#e2a70e;fill-opacity:1;stroke:none"
+ d="m 999.3113,828.77469 c 13.4815,-0.11069 52.8512,12.57551 51.5794,18.1524 -0.3314,1.45336 -14.1062,4.3733 -19.4431,6.88733 -3.0457,1.43475 -0.3112,5.80268 -3.144,6.15192 -2.8328,0.34923 -8.8116,-2.80239 -15.0153,-3.22992 -7.9711,-0.54933 -25.12331,1.9673 -28.50375,1.63031 -3.38042,-0.33698 -3.8276,-22.77136 -1.94051,-23.64774 5.60072,-2.57993 12.48316,-5.65028 16.46726,-5.9443 z"
+ id="path3775-9-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csszszcc" />
+ </g>
+ <g
+ transform="translate(-594.28572,-196.85364)"
+ style="display:inline;fill:#2a2a2a;fill-opacity:1"
+ id="g4602">
+ <path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2a2a2a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate"
+ d="m 1047.5807,761.80244 c 0,48.36946 -39.2113,87.58066 -87.58072,87.58066 -48.36945,0 -87.58065,-39.2112 -87.58065,-87.58066 0,-24.18473 13.8028,-71.40879 29.65178,-112.58666 15.84898,-41.17788 25.49178,-72.49935 59.03328,-72.49935 33.54151,0 40.97541,31.32147 56.82441,72.49935 15.849,41.17787 29.6519,88.40193 29.6519,112.58666 z"
+ id="path2992"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssszzzs" />
+ <path
+ style="fill:#2a2a2a;fill-opacity:1;stroke:none"
+ d="m 1037.6216,728.00614 c 23.716,-0.38105 55.6572,10.63018 59.7453,12.83874 10.9697,-19.99218 -50.0446,-46.77657 -71.2956,-65.89171 -12.1316,-10.91225 6.4731,51.31353 11.5503,53.05297 z"
+ id="path3807"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsc" />
+ <path
+ style="display:inline;fill:#2a2a2a;fill-opacity:1;stroke:none"
+ d="m 882.37842,728.00614 c -23.716,-0.38105 -55.6572,10.63018 -59.7453,12.83874 -10.9697,-19.99218 50.0446,-46.77657 71.2956,-65.89171 12.1316,-10.91225 -6.4731,51.31353 -11.5503,53.05297 z"
+ id="path3807-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsc" />
+ </g>
+ <path
+ sodipodi:nodetypes="sssss"
+ inkscape:connector-curvature="0"
+ id="path3829"
+ d="m 426.85729,547.62604 c 0,38.44108 -26.2701,67.60375 -61.14303,67.60375 -34.8729,0 -61.14297,-29.16267 -61.14297,-67.60375 0,-38.44109 26.27007,-75.60375 61.14297,-75.60375 34.87293,0 61.14303,37.16266 61.14303,75.60375 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="szszs"
+ inkscape:connector-curvature="0"
+ id="path3792"
+ d="m 404.38759,489.32906 c 0,7.97791 -22.81369,28.56754 -38.67333,28.56754 -15.85964,0 -38.67338,-21.38032 -38.67338,-28.56754 0,-6.377 17.31467,-23.90146 38.67338,-23.90146 21.35873,0 38.67333,17.00327 38.67333,23.90146 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b28b16;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="szszs"
+ inkscape:connector-curvature="0"
+ id="path3792-7"
+ d="m 399.06482,489.65017 c 0,6.87987 -19.67375,24.63567 -33.35056,24.63567 -13.67682,0 -33.35061,-18.43766 -33.35061,-24.63567 0,-5.49931 11.32081,-22.61181 33.35061,-22.61181 22.0298,0 33.35056,16.66304 33.35056,22.61181 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1c43c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="ccsccsc"
+ inkscape:connector-curvature="0"
+ id="path3803"
+ d="m 328.43301,490.14636 -0.0625,0.71875 c 0,0 16.04366,16.65625 37.34375,16.65625 21.30009,0 37.34375,-16.65625 37.34375,-16.65625 l -0.0625,-0.71875 c 0,0 -16.50458,15.32236 -37.28125,15.32236 -20.77667,0 -37.28125,-15.32236 -37.28125,-15.32236 z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#b28b16;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate" />
+ <g
+ transform="translate(-594.25403,-196.85364)"
+ id="g4625"
+ style="display:inline">
+ <path
+ style="fill:#f2f2f5;fill-opacity:1;stroke:none"
+ d="m 939.0157,625.16734 c 8.22345,-3.27448 13.36227,12.73386 11.8014,21.21012 -1.56086,8.47625 -9.50431,12.46262 -16.2504,5.30623 -6.7461,-7.15639 -3.77445,-23.24187 4.449,-26.51635 z"
+ id="path2999"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzz" />
+ <path
+ style="display:inline;fill:url(#linearGradient4503);fill-opacity:1;stroke:none"
+ d="m 942.97212,636.2935 c 6.98855,-0.19342 7.86724,17.20381 1.52621,16.26008 -6.34105,-0.94375 -8.51478,-16.06661 -1.52621,-16.26008 z"
+ id="path3769-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="fill:#171717;fill-opacity:1;stroke:none"
+ d="m 943.91329,641.70876 c 2.94998,-0.0863 3.32089,7.67564 0.64424,7.25458 -2.67665,-0.42106 -3.59422,-7.16827 -0.64424,-7.25458 z"
+ id="path3769"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="display:inline;fill:#f2f2f5;fill-opacity:1;stroke:none"
+ d="m 980.92095,625.16734 c -8.22345,-3.27448 -13.36227,12.73386 -11.8014,21.21012 1.56086,8.47625 9.50431,12.46262 16.2504,5.30623 6.7461,-7.15639 3.77445,-23.24187 -4.449,-26.51635 z"
+ id="path2999-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzz" />
+ <path
+ style="display:inline;fill:url(#linearGradient4503-2);fill-opacity:1;stroke:none"
+ d="m 977.02571,636.2935 c -6.98855,-0.19342 -7.86724,17.20381 -1.52621,16.26008 6.34105,-0.94375 8.51478,-16.06661 1.52621,-16.26008 z"
+ id="path3769-9-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="display:inline;fill:#171717;fill-opacity:1;stroke:none"
+ d="m 976.08665,641.70876 c -2.94998,-0.0863 -3.32089,7.67564 -0.64424,7.25458 2.67665,-0.42106 3.59422,-7.16827 0.64424,-7.25458 z"
+ id="path3769-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="display:inline;fill:#ffffff;fill-opacity:0.90232556;stroke:none"
+ d="m 941.32961,639.49936 c 2.59421,-0.0649 2.92038,5.77001 0.56654,5.45349 -2.35384,-0.31653 -3.16075,-5.38861 -0.56654,-5.45349 z"
+ id="path3769-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="display:inline;fill:#ffffff;fill-opacity:0.76744187;stroke:none"
+ d="m 942.09935,645.81792 c 1.70477,-0.0343 1.91911,3.04768 0.3723,2.88049 -1.54682,-0.16719 -2.07708,-2.84622 -0.3723,-2.88049 z"
+ id="path3769-2-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="display:inline;fill:#ffffff;fill-opacity:0.90232556;stroke:none"
+ d="m 974.66822,639.49936 c -2.59421,-0.0649 -2.92038,5.77001 -0.56654,5.45349 2.35384,-0.31653 3.16075,-5.38861 0.56654,-5.45349 z"
+ id="path3769-2-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ <path
+ style="display:inline;fill:#ffffff;fill-opacity:0.76744187;stroke:none"
+ d="m 973.89848,645.81792 c -1.70477,-0.0343 -1.91911,3.04768 -0.3723,2.88049 1.54682,-0.16719 2.07708,-2.84622 0.3723,-2.88049 z"
+ id="path3769-2-0-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzz" />
+ </g>
</g>
+ <g
+ id="g971"
+ transform="translate(257.57396,-179.68923)">
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzcccczzzzsccz"
+ id="path49949-6-3"
+ d="m -183.20748,246.70012 c -2.26898,0.35168 -5.50352,1.63555 -7.66469,3.12562 -2.16118,1.49005 -2.25837,5.0899 -4.40755,5.04971 -2.14918,-0.0402 -1.75669,-3.0022 -3.20444,-4.23989 -3.78005,-2.72132 -13.29302,-2.88583 -11.69447,1.25948 3.04195,2.2542 7.38154,3.68381 7.91936,7.22941 -0.31069,11.05011 -9.37334,8.6578 -7.26547,13.36716 0.48181,1.41241 5.63674,1.11181 9.17374,-1.48152 3.53699,-2.59333 2.3289,-6.05256 5.23205,-5.88854 2.90315,0.16402 2.83179,3.698 4.74938,5.25512 1.9176,1.55713 3.76904,2.86321 6.40819,3.18813 2.63915,0.32493 6.44952,-0.84282 8.69418,-2.30227 5.27962,-3.43275 7.26958,-7.69179 6.85655,-12.4498 -0.5649,-5.45822 -4.35885,-8.95888 -9.31532,-11.67503 -2.24428,-0.79039 -3.21253,-0.78927 -5.48151,-0.43758 z"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37603334px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csssc"
+ inkscape:connector-curvature="0"
+ id="path4205-7-6"
+ d="m -176.31529,248.53921 c -0.12437,-2.15227 -3.32676,-7.18637 -4.69647,-7.1095 -0.61451,0.0345 -13.22024,5.30898 -12.90116,6.14937 0.23795,0.62671 1.68765,5.24194 0.069,6.81628 -1.28649,1.25129 13.71168,-7.16289 17.52859,-5.85615 z"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="csssc"
+ inkscape:connector-curvature="0"
+ id="path4205-75"
+ d="m -177.35089,248.74787 c -0.11248,-1.93313 -2.69652,-6.14457 -3.93528,-6.07553 -0.55576,0.031 -11.95635,4.76839 -11.66778,5.52321 0.2152,0.56289 1.46387,3.90205 0,5.31608 -1.16349,1.12388 12.15106,-5.93745 15.60306,-4.76376 z"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path4173-3-3"
+ d="m -184.7081,273.1705 c -1.29504,1.13921 -1.41712,3.45138 -4.18574,3.11701 l -8.99488,-5.69969 c -1.81959,-1.61832 4.36672,-1.42732 5.43255,-4.09665"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path4173-5"
+ d="m -185.36384,271.66918 c -1.00394,0.88315 -1.58186,3.50409 -3.72817,3.24489 l -6.97305,-4.41857 c -1.41059,-1.25458 3.86847,-1.58979 4.69473,-3.65913"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzscsczzzzcccz"
+ id="path49949-2-6"
+ d="m -183.70281,247.71851 c -2.0959,0.32486 -5.08371,1.5108 -7.08003,2.8872 -1.99632,1.3764 -2.72384,5.08429 -4.70908,5.04716 -1.98524,-0.0371 -1.98998,-2.17723 -2.84264,-3.71622 -2.36969,-4.27712 -12.52933,-2.39877 -10.89172,-0.37609 2.64595,2.82543 7.59721,3.60516 7.48873,7.56185 -0.26862,9.79816 -7.29627,9.53658 -6.78444,12.02551 0.51182,2.48894 4.54419,1.28246 7.5255,-0.48029 2.98132,-1.76275 3.60913,-6.78589 6.29082,-6.63438 2.68169,0.15151 2.61577,4.11742 4.38709,5.55577 1.77133,1.43834 3.48154,2.6448 5.91937,2.94494 2.43784,0.30014 5.73621,-0.61653 7.93602,-1.74676 4.4771,-2.42012 7.62899,-7.1638 7.36956,-12.13358 -0.73732,-4.97818 -4.90028,-8.82681 -9.5458,-10.5309 -2.07309,-0.7301 -2.96748,-0.72906 -5.06338,-0.40421 z"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37603334px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ d="m -170.8831,258.08835 a 2.1402433,3.521045 0 0 1 -2.42265,2.98189 2.1402433,3.521045 0 0 1 -1.81432,-3.98345 2.1402433,3.521045 0 0 1 2.41997,-2.98779 2.1402433,3.521045 0 0 1 1.8179,3.97903"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="3.521045"
+ sodipodi:rx="2.1402433"
+ sodipodi:cy="257.58499"
+ sodipodi:cx="-173.00136"
+ sodipodi:type="arc"
+ id="path4222-2"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eaeef3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <g
+ transform="matrix(0.44660911,0,0,0.44660911,-211.66812,241.36861)"
+ id="g4260-9">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 52.831299,11.909664 0.231634,4.416381 -6.542108,3.820918 2.372635,-5.969382 z"
+ id="path54402-7-1"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 64.284013,7.2241726 2.9907,7.2007784 c -2.5237,0.293465 -7.104296,0.674768 -8.65198,1.155308 L 58.260718,9.7722697 Z"
+ id="path54404-0-2"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 42.684455,67.522645 -1.483308,-1.255664 3.643043,-6.649313 c 0,0 1.393462,1.850702 3.995219,3.87615 z"
+ id="path54408-9-7"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 50.363347,72.08288 -2.613995,-1.996434 3.537033,-5.224555 c 0,0 2.685402,2.326361 4.623345,3.3429 z"
+ id="path54410-3-0"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 54.642546,19.043977 c -5.723723,13.28725 -6.281067,31.809085 -5.396156,43.066107 l 5.199252,2.638837 C 55.893887,47.684747 58.95521,33.655899 58.952291,17.556116 l -4.309752,1.487861 z"
+ id="path50840-6-9"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 66.870433,15.60753 c -0.611634,7.921003 -7.337926,35.515477 -4.724949,52.642868 l 5.534855,-0.127258 c 3.549198,-17.698408 0.715164,-34.893271 4.171053,-52.155324 z"
+ id="path54390-0-3"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 81.873837,19.856797 c -8.24855,16.2556 -8.363773,33.390058 -2.906349,44.995222 L 82.43413,62.434954 C 75.529554,54.680095 76.854091,29.904202 84.700906,21.788469 Z"
+ id="path54392-6-6"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 44.212301,25.178929 c 1.61736,9.439495 2.224593,20.16 0.186056,30.411086 L 40.3838,50.096387 C 42.089675,43.259508 39.806171,38.418943 39.460501,31.474975 Z"
+ id="path54394-2-0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 28.387569,24.19267 c 6.70678,10.719212 7.418831,15.393452 4.604951,27.735361 0,0 -3.038566,5.610849 -6.100646,8.910024 6.94787,-20.398454 4.209197,-27.930707 -4.649858,-41.174086 z"
+ id="path54396-6-6"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+ <path
+ d="m -171.09097,257.73869 a 1.0931349,1.8295627 0 0 1 -1.23738,1.54942 1.0931349,1.8295627 0 0 1 -0.92667,-2.06984 1.0931349,1.8295627 0 0 1 1.23601,-1.55247 1.0931349,1.8295627 0 0 1 0.92849,2.06753"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="1.8295627"
+ sodipodi:rx="1.0931349"
+ sodipodi:cy="257.47714"
+ sodipodi:cx="-172.17288"
+ sodipodi:type="arc"
+ id="path4224-5-2"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#214f8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ d="m -171.42159,257.82741 a 0.79396117,1.2427218 0 0 1 -0.89873,1.05243 0.79396117,1.2427218 0 0 1 -0.67305,-1.40593 0.79396117,1.2427218 0 0 1 0.89773,-1.05451 0.79396117,1.2427218 0 0 1 0.67438,1.40437"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="1.2427218"
+ sodipodi:rx="0.79396117"
+ sodipodi:cy="257.64975"
+ sodipodi:cx="-172.2074"
+ sodipodi:type="arc"
+ id="path4224-6"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1f2a38;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ d="m -172.2233,258.40469 a 0.55232084,0.6213609 0 0 1 -0.6252,0.52621 0.55232084,0.6213609 0 0 1 -0.46821,-0.70296 0.55232084,0.6213609 0 0 1 0.62451,-0.52726 0.55232084,0.6213609 0 0 1 0.46914,0.70218"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="0.6213609"
+ sodipodi:rx="0.55232084"
+ sodipodi:cy="258.31586"
+ sodipodi:cx="-172.76994"
+ sodipodi:type="arc"
+ id="path4241-1"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ <path
+ d="m -172.60049,259.90966 a 0.25940847,0.32844853 0 0 1 -0.29364,0.27815 0.25940847,0.32844853 0 0 1 -0.21991,-0.37158 0.25940847,0.32844853 0 0 1 0.29332,-0.27871 0.25940847,0.32844853 0 0 1 0.22033,0.37117"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="0.32844853"
+ sodipodi:rx="0.25940847"
+ sodipodi:cy="259.8627"
+ sodipodi:cx="-172.85724"
+ sodipodi:type="arc"
+ id="path4241-3-8"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+ </g>
+ <path
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 47.975785,26.171914 -6,10.5 h 4.5 v 10.5 h 3 v -10.5 h 4.5 z"
+ id="rect2066"
+ inkscape:connector-curvature="0" />
<path
- style="fill:#37c837;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.34952599px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 82.856009,54.36729 -5.003083,0.652232 -2.144094,0.651689 -0.429375,-2.301119 0.904701,-2.822399 4.526764,0.129399 2.287172,-0.08727 0.428044,-3.51701 1.095956,0.04321 1.048455,0.694503 3.527081,4.341221 -4.382711,4.690069 -1.715315,0.347677 -0.381417,-0.955144 0.237822,-1.867057 z"
- id="path12360"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:2.25000048;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 65.828087,39.537521 -6,4.500001 6,4.500001 v -2.999991 a 6.0000004,6.0000004 0 0 1 5.999998,6.00001 6.0000004,6.0000004 0 0 1 -5.999998,5.999983 6.0000004,6.0000004 0 0 1 -6,-5.999983 h -3.000001 a 9.0000019,9.0000019 0 0 0 9.000001,9.000002 9.0000019,9.0000019 0 0 0 8.999999,-9.000002 9.0000019,9.0000019 0 0 0 -8.999999,-9.000002 z"
+ id="path2022"
inkscape:connector-curvature="0" />
<path
- style="fill:#3a9a0e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 75.755518,49.548303 -1.071259,3.624673 -0.213542,3.711349 3.909064,-1.215194 3.432744,-0.433565 -0.0075,2.691016 2.815702,0.0437 5.37926,-5.685326 -4.572805,-5.904619 -2.427371,-0.22072 c 0,0 -0.241987,3.165361 -0.670745,3.556212 -0.428759,0.390851 -6.573573,-0.167529 -6.573573,-0.167528 z m 1.18527,1.692215 4.961697,0.347247 1.814992,-0.520534 0.180935,-2.86556 0.29114,-0.604612 0.954844,0.427432 0.66371,0.96324 2.390266,3.205849 -2.146255,2.480862 -1.820074,1.821388 -0.663448,0.0886 0.533444,-2.477308 -1.764021,-0.736931 -6.011345,1.394569 0.614115,-3.524239 z"
- id="path12362"
- sodipodi:nodetypes="ccccccccccscccccccccccccccc"
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 87.072636,30.56416 6,4.5 -6,4.5 v -2.99999 a 5.9999992,5.9999992 0 0 0 -6,6.000009 5.9999992,5.9999992 0 0 0 6,5.999981 5.9999992,5.9999992 0 0 0 6,-5.999981 h 3 a 9,9 0 0 1 -9,9 9,9 0 0 1 -9,-9 9,9 0 0 1 9,-9 z"
+ id="path2022-3"
inkscape:connector-curvature="0" />
</g>
</svg>
diff --git a/src/activities/programmingMaze/resource/README b/src/activities/programmingMaze/resource/README
index 9deafcebc..5498472c9 100644
--- a/src/activities/programmingMaze/resource/README
+++ b/src/activities/programmingMaze/resource/README
@@ -1,5 +1,11 @@
-1. turn-left.svg: https://upload.wikimedia.org/wikipedia/commons/5/50/Simpleicons_Interface_undo-circular-arrow.svg By SimpleIcon http://www.simpleicon.com/ (http://www.flaticon.com/packs/simpleicon-interface) [CC BY 3.0 (http://creativecommons.org/licenses/by/3.0)]
-
-2. turn-right.svg: https://upload.wikimedia.org/wikipedia/commons/b/b5/Simpleicons_Interface_redo-circular-arrow.svg By SimpleIcon http://www.simpleicon.com/ (http://www.flaticon.com/packs/simpleicon-interface) [CC BY 3.0 (http://creativecommons.org/licenses/by/3.0)]
-
-3. move-forward.svg: https://www.flaticon.com/free-icon/arrow-pointing-to-up_66757 By Freepik
\ No newline at end of file
+Copyright: Timothée Giet, 2019
+License: CC-BY-SA 4.0
+Files:
+background-pm.svg
+call-procedure.svg
+move-forward.svg
+turn-left.svg
+turn-right.svg
+tutorial1.png
+tutorial2.png
+tutorial3.png
diff --git a/src/activities/programmingMaze/resource/background-pm.svg b/src/activities/programmingMaze/resource/background-pm.svg
new file mode 100644
index 000000000..238897ff3
--- /dev/null
+++ b/src/activities/programmingMaze/resource/background-pm.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="800"
+ height="520"
+ viewBox="0 0 211.66666 137.58334"
+ version="1.1"
+ id="svg951"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="background-pm.svg">
+ <defs
+ id="defs945">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient845">
+ <stop
+ style="stop-color:#a0d6e9;stop-opacity:1;"
+ offset="0"
+ id="stop841" />
+ <stop
+ style="stop-color:#a0d6e9;stop-opacity:0.18095239"
+ offset="1"
+ id="stop843" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient845"
+ id="radialGradient847"
+ cx="100.54166"
+ cy="229.53127"
+ fx="100.54166"
+ fy="229.53127"
+ r="82.020838"
+ gradientTransform="matrix(7.1932947,8.3746518e-8,-4.542181e-8,3.9014471,-343.22579,-735.50413)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.98994949"
+ inkscape:cx="273.57504"
+ inkscape:cy="243.20738"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid1674" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata948">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-159.41666)">
+ <rect
+ style="opacity:1;vector-effect:none;fill:#d5e9f0;fill-opacity:1;stroke:none;stroke-width:0.5291667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect829"
+ width="211.66667"
+ height="137.58334"
+ x="0"
+ y="159.41666" />
+ <path
+ style="opacity:1;vector-effect:none;fill:url(#radialGradient847);fill-opacity:1;stroke:none;stroke-width:2.57441044;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 0,0 v 230 h 377 l 63,-55 V 0 Z"
+ transform="matrix(0.26458334,0,0,0.26458334,0,159.41666)"
+ id="rect1676-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="opacity:1;vector-effect:none;fill:#1dade4;fill-opacity:1;stroke:none;stroke-width:2.36643195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 0,0 v 220 h 376 l 54,-46 V 0 Z"
+ transform="matrix(0.26458334,0,0,0.26458334,0,159.41666)"
+ id="rect1676"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ </g>
+</svg>
diff --git a/src/activities/programmingMaze/resource/call-procedure.svg b/src/activities/programmingMaze/resource/call-procedure.svg
index 0ad22c6af..e9254a31c 100644
--- a/src/activities/programmingMaze/resource/call-procedure.svg
+++ b/src/activities/programmingMaze/resource/call-procedure.svg
@@ -1,60 +1,121 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg"
+ width="58"
+ height="14"
+ viewBox="0 0 15.345834 3.7041668"
version="1.1"
- width="400"
- height="285.625"
- style="display: block;"
- inkscape:version="0.91 r13725"
+ id="svg1475"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="call-procedure.svg">
+ <defs
+ id="defs1469" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.919596"
+ inkscape:cx="12.204213"
+ inkscape:cy="-1.9176686"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2020"
+ empspacing="4" />
+ </sodipodi:namedview>
<metadata
- id="metadata13">
+ id="metadata1472">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
- <defs
- id="defs11" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1056"
- id="namedview9"
- showgrid="false"
- inkscape:zoom="0.695"
- inkscape:cx="200"
- inkscape:cy="142.8125"
- inkscape:window-x="0"
- inkscape:window-y="24"
- inkscape:window-maximized="1"
- inkscape:current-layer="svg" />
- <image
- y="-13.867792"
- x="1.6690685"
- id="image3649"
- xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAOAAAABRCAIAAABE2T1mAAAAhXpUWHRSYXcgcHJvZmlsZSB0eXBl IGV4aWYAAHjaVY7bDYAwCEX/mcIReBXKOMbUxA0cX0g1jecDbm7aE2Dc1wlbQcigzbuFGSYaGrxn 6DgRRGKk2jkn7xbKxKsG4RksuqOuh/r2H02s2+nqbs0OOzjtPISFc5aorFhnxJKM77f8+0Z/OTxH qCxGXxIwDQAACgRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/ IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRv YmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDQuNC4wLUV4aXYyIj4KIDxyZGY6UkRGIHht bG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+CiAg PHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgIHhtbG5zOmV4aWY9Imh0dHA6Ly9ucy5h ZG9iZS5jb20vZXhpZi8xLjAvIgogICAgeG1sbnM6dGlmZj0iaHR0cDovL25zLmFkb2JlLmNvbS90 aWZmLzEuMC8iCiAgIGV4aWY6UGl4ZWxYRGltZW5zaW9uPSIyMjQiCiAgIGV4aWY6UGl4ZWxZRGlt ZW5zaW9uPSI4MSIKICAgdGlmZjpJbWFnZVdpZHRoPSIyMjQiCiAgIHRpZmY6SW1hZ2VIZWlnaHQ9 IjgxIgogICB0aWZmOk9yaWVudGF0aW9uPSIxIi8+CiA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBh Y2tldCBlbmQ9InciPz4YgYPxAAAAA3NCSVQICAjb4U/gAAAOe0lEQVR42u2deVQURx7Hp2eYi5lh YLhRTlEBFTkFAUU8UEkARUFFoyS6ajw2+qLZZ2Li5njJW43R6MZ4oUQEBUFAERBBQERBRFQIAUEQ EBHmYGaYGebu/WP3bRLsHubs4Hv1/Remq6v6U1W/37erqiEYhnFAQONVeNAEQABQICAAKBAAFAgI AAoEBAAFAoACAQFAgQCgQEAAUCAgACgQABQICAAKBAAFAgKAAgEBQIEAoEBAppKZEa6hlnKfN1SW lVc/aHnRPzDIZnO4/OEROY7EsGRZ29jZOTg6u3v5R0RFzpruYc8gQsauA/KmAAiCTHp9IxaAcTl6 359KJhYM8fiCYZFYIpaIRUL+EF8okshUEJFKo9PpdAbTimVtbWvvaG9FI+KN1ip6SjnUnH9oW9ws dxZFy3uBiBYTZizYcCCtskOggI0gacflLf42NCSZ090TTjaLDSyAXbhpKh35+qxpq47VC2DjSNFx JnaCOWJBNIdZWzPbZPBfILWwpej0wc92rF++MGSam72lOYmgVV+B8CS6jYtPSHTyxz9efdAtNORZ 6wWonPM4a/8yH0uC/pEFzXXuph9KnovUhjSgoHpfAA29EKJHSl6/QQWo+zIT7NGeCXHK1hKukVCQ NR0Mp6PVgx76TYPkr+CzN32ZneFDIERiTZ73wcHCNoESA0AVA3e/XznVgmCU0Zs248O8Hr27l7L3 8mpnzTditeDHX6WmApTgvrEIE0CpgQfq32JA/x9NsmYmH7zZJdFtyNAlUFCxaw6vClu0J6dNqDLK LctEUgJZX9alv2b9XNKr+UaG7p1LqxOATGNcSMl7kvlJTFDUxwXdchNk8aKmM+sjovdcfT5itDsm eixeFWanZwbAu5t6rpY/1n+NNF8+UdyrBnSMF6m4dUdWL0xJbZEYFVBp2/lN8Tsyn0mMea8kj4XL g6317I2dBcezfpNp0SC9N09l/yoFZIwjSTsu7Vr/ZQUPNhKgMO/ONym7s7vkxr1NytTYVaEs/X4r eXLpbMWAdidO8O+nnq7mASzGlUQNP+09dJevxX+O6YMqXmTt2nioVqDl+SN4EsPOxXOKp4stg6iW ioeH+ezerq6Xg0LZqHmWMnlxrJ+Ffs7YQNmJ8/XDWke6bVdPFe2Zv86VAMAwpggUprWNFcOcQiYS YIVUPCwQiiQjI1K5Uq0FLOJHZ77J2HBtuxfZIB9U+fLKe25jm/l4mvv8rUcK6jsGhuWqN6+ikg71 NBaf+XRVsBP1f0M2PfiL2mE9zc/mo/OtdGtLesiXdSKQxRszizfzTLnYwhtlwahVcjG3u/HGiT0J gY7UsbILRvh3jRLDbCbhvf3BtDFcLppX8vF7r7U0kuXclqJjO+MXJ+7NaNKzzYU1+/ypyN0Ejxqw kKZsLeEAQI0K6NabPI1VepH7oS9dIzsWkYebZQbYTMquqwdTG8SaAgSnxd/dqknfMduepGXizvJe uvNYfkn2weTpVL0mFvad89lNiE4CLSB2ua81EfFX8o7CtLKXIJvHUCTXhKMF5/42zRz9X4RNN++8 UOqdJAnunzxa2q/hoVoE77mY8clsFoYLTlTdJamFnYh1svBfuXPn1lhv5E6r7is9m98mB9xgyqhb /O7NoZYa8nnegFCuL6Ccmgs5zei+EmS94MDp/VHWmC5kkP129VzFa8QQ3Co4MS4iLHFzUgATxYu4 n579RAyowXgYDQ33QJ8q5YLBIX0BFbZW1b9CH37JPmv3pfjRsK3ucENm+gNEbwKyC1/zzmQy0SYo KXm2DUre+CQ7/R7wm7CVuVvgdFtUyFQi7tAIrBeg4rbyyg5UfxtizdmyJYKFcWU51WlXkMd0vNO8 tYvdzXA4HNEzbmO0M3KtZK15qaUgEMVUsEIilmtAEMbBeo2gss6q8lb0+dAqeMWSKWRsq6rqLj57 /bkCMZ92WbQ2asJ/qwI5RiZHu5uhBKK30290gEAUQ4k6H7UNoTJIoFlbjuFGIQMKc5pr29GdcLpX ZOhEM2xrKmvNT6tEDj+Jk2LWRPzuBtmGJb8zGdlVgNl3zl96LALcYCVpd319L/obaZKVkw1FnxFU zu15LULlnuQSEuZBxbamww0Zv9QOIf6J4hW3KoT1p/E9Kd4H5f5EjZlpNVxADiZS9pacOF+vYTUZ zX4ii6QXoAKOQIF+WWcvZ4zTI07NhVwUS4E2Y3li4J8zd0bg6jVBKK9R5c8L08pBIGqM8FLz5zcU Lwv3LttwUoMRhGP6zAtyJOgDqJTPGUbN4CGqpZU5ppvt1C/L0250IPcYZkBigu/o7kLxSVgXjrJQ SvWyDPViQLqMj2IxQjivkgy0lKV+tjZiis+yo4+Emhhm+sVGj5nJIEaSagmXI0ZdCkygMhkkLO1P 5YvSixV9iIMeZB26Os77zTCG6L4kea5DSR5S0Apz7mUWtKzfO5MKIDPgoXRfP7CBfWUi00ytkEmE PPYgm83l8Yd4XIFEqdXKIquA+MVjZ9qIgCqEAzz0JZQQyZyKZYYkb7+RWTOIvOHRJixp6SSkKIYw cf6aqAkFlxAnc0FD1pXHW2fOZgDO9JdisLniWrPePzf32/hFyvSxnSA88hhpyUCPXZVDvf0i7L7+ JWq8nF6HnB7hnaKSo12ROwveMSJh7gSUSETclJuJck0gLETz23roH5HarElDBpTGsqKgTuKw6HUv D7MYTtCQfbUJ2Rj6o/2JMLpqMERx8o6iS3cHwTf2/hKR3RN/uPj1QhutwkTExwuRGRYa9rrLea84 WG2i4NZeLmxDLmyU/fmmNBiiOOWL0szKfpDMYy0803/7xfL0zZoWOWmRxZPoTHP0MFPB73uNzRwP D1RnFiO/PcKRPQM8FX39QplKjSwZjyO3c7UlojgDfRWZpd1KgAx2bFpMjf9n3sPq4yvddXgJiYwh 2cbZjorDobwCgIXdz16N4JzMTV0ldd/tjDK0ncWy1iv/WJH/GQGPHovAKoVUptQA/432NTu8yYAd E5NJtZ+2YO3uz/Ymhzro3NjIgBIdfHzsibf5KJGmuONuXa88aCrJtBVTPC9K1zANwyqFTGVILMy7 n5HT9P7nQTTAkLEF4Uk0lqOrd+g7a95bHRvpO5Gu74YwlImc6T1npu1Pba9QJnLeg6xrrRv3+lJM WcmR5twLNRxThhKixzlZjz4KmmMBiNJdFPeIpbNc6SQC3oxEpVswmRYMC0trW3tHJ2c3T0/3CTYM MsEIbjkKoJCtb4QXM/sV2sZQQWN2VsNm33CmCel5kpvTKDRtI0tbr1+u3TcnmgV401UEp3m7j51M mGjiWRR1PSjRcYavk4bCRQ0n9596ZMIF6vyH2QXNElM3s/x5MbCb9BSRRiOZvhRUM4kZmBivyQuA eVXfbv+2kmMip0bw+Fppu8z09Vf2VOXVsgGh4zfDQv0LI3BdymxNcx8sqP1X0sovbw+YwKvh1mbd eCbDogFU3WWZla+AITpepeGlOtkr8cOYw5UXe9BPkFOxq76KCazeeeTEFyu9GNqFxAp++92cMz9e 4SUcO75+KvKCDU5dblkXWoIOsTxDpjnTdTgWT9r/pL6FLUMeJ9V9FRm3elakuOmeZ6rkcjUmp6gr FAocjgoAHT26OkZvSwks+OqBxlNmZH0V3yf5Zc5atnb9uuSEqOkONLPRpMJKCe9l+9MH1eXFBVcL q1s5MhiHo3SeXR9/aC5CmgUP1mTfQuWTFvzRxdL9IQwduFCxKz6PXfZdHXLKBbPv55S9WLdpko4r YFTshqzUTEqkO13HZNXMemqgl432pUl7Ki+k5khmOepqmlCdfP3cGW/5ZwjGOFyCW/XpLB1cGDyJ znJ0mzI9MCxq0aKoiBA/H09XJ1smBclwoMzYU8VHKFPVeykJ9Q07jh769UPdD/aWNh2O1OA4WC/+ uU2u68ki+goy991VztPhZBG9wzdW1KHHEhOdLELw2FzCw+B4kzG6F8Sa++nP+6NY2j4ktVzE63/x rLnhXsWtWxV36x63dHS/YgukKoTpVfqs5NrjN/cDqHrKL1ehBoX06e/G+Oj+Cos8JSYxGD2g5tZl F7XLsBoSpDy2EIvFNmoxhyN+26Prscd/WsDfTx1OdCUav2zZs+L8RsEbfFbk3kc1fhgzYmO89QnG SJMWLg9CJ5TfWHATO0JB6mNMQHE48uQNp68eWelh9JfW8vai7Lo/H6Ug7yi6VIPKp2UQ+na4MUT0 jFkdbotO6MPsfNPbrkAmARSHg5gB2zMqcvaG2Rj3jE1FV1le/R/3WMq7ygoaUE//sPSPi/bUt5sQ nCPjNBzoLGq+UdwKCH1LAcXhcDiSy7sHb1X/sn22g/HeHxCY9paw7Pd4TNp2PfsBKp8Mn+h5Bgzj BJd5cRpmedHTvNwnYMv82wsoDofDmXut/ffd9t9Kj3ww25FsUHYLUez9V36ecSv/qyVOxN/5LLn+ FHUbNcM3fqmXIctTzNwWJc5GX8ctaSspfDqMQZtDbw0dGr5xB+GxqYbuu9/wdI9Fu1IXbjlQk5tx Kfd6aXVjJ1eqXa4IEajWbr5zYtdsWLt8vp8LY1ThsGQYsne1o44I3rgcnmLttWJb0jTDlk+ZuS7Z 9n74oxONAjXCKdWUCY4EvkCJ+8NtQUzvOeHe98s6eTIjZTYwRLGZMidi8qj9emYOAZEhHm21fcPG ei0H480d/SNDnA1JHMgsBzsmfVimgEd1KohA95g5iY5FtgeNsf1+bKlG2J1Paqvu1LX29Pf3DwwM DnL5wxI5TCDRmFaWTAsG3cJukn9oaODM6dOmutnRNX2rE1ar1Sj3A0F4vFE6LaxSqtCqjCeYvVEG rFapjfskIDzSKmsNddd7/DO4yWC1UqXWuqnGJ6BAQOMmBgUCAoACAQFAgQCgQEAAUCAAKBAQABQI CAAKBAAFAgKAAgFAgYAAoEBAAFAgACgQEAAUCAAKBAQABQLSQf8BKHfGfItv2YwAAAAASUVORK5C YII= "
- preserveAspectRatio="none"
- height="316.97122"
- width="396.6619" />
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-287.49738)">
+ <g
+ aria-label="CALL P"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.19780493px;line-height:1.25;font-family:monospace;-inkscape-font-specification:'monospace Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.31483537"
+ id="text816"
+ transform="translate(0.26458346,-0.26460659)">
+ <path
+ d="m 1.9796781,291.05398 q -0.1434797,0.0738 -0.3013073,0.11069 -0.1578276,0.0369 -0.3320529,0.0369 -0.61901227,0 -0.94491607,-0.40789 -0.3259038,-0.40789 -0.3259038,-1.17858 0,-0.77274 0.3259038,-1.18064 0.3259038,-0.40789 0.94491607,-0.40789 0.1742253,0 0.3341026,0.0369 0.1598774,0.0369 0.2992576,0.11068 v 0.67231 q -0.1557779,-0.14348 -0.303357,-0.20907 -0.1455294,-0.0676 -0.3013073,-0.0676 -0.3320529,0 -0.5021788,0.26441 -0.16807617,0.26236 -0.16807617,0.78094 0,0.51652 0.16807617,0.78094 0.1701259,0.26236 0.5021788,0.26236 0.1557779,0 0.3013073,-0.0656 0.1475791,-0.0676 0.303357,-0.21112 z"
+ style="font-size:4.19780493px;text-align:center;text-anchor:middle;fill:#2a2a2a;fill-opacity:1;stroke-width:0.31483537"
+ id="path815"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 3.5518053,288.63533 3.2668957,289.8877 H 3.8387646 Z M 3.1828576,288.0819 h 0.7399451 l 0.8260329,3.06022 H 4.1441713 L 3.9555981,290.38578 H 3.1459628 L 2.961489,291.14212 H 2.3568247 Z"
+ style="font-size:4.19780493px;text-align:center;text-anchor:middle;fill:#2a2a2a;fill-opacity:1;stroke-width:0.31483537"
+ id="path817"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 5.275611,291.14212 v -3.06022 h 0.6046643 v 2.5273 h 1.2933666 v 0.53292 z"
+ style="font-size:4.19780493px;text-align:center;text-anchor:middle;fill:#2a2a2a;fill-opacity:1;stroke-width:0.31483537"
+ id="path819"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 7.8008533,291.14212 v -3.06022 h 0.6046643 v 2.5273 h 1.2933667 v 0.53292 z"
+ style="font-size:4.19780493px;text-align:center;text-anchor:middle;fill:#2a2a2a;fill-opacity:1;stroke-width:0.31483537"
+ id="path821"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 13.32687,288.59023 v 0.89777 h 0.248014 q 0.297208,0 0.416091,-0.10043 0.120933,-0.10044 0.120933,-0.34845 0,-0.24802 -0.120933,-0.34845 -0.118883,-0.10044 -0.416091,-0.10044 z m -0.604665,-0.50833 h 0.830133 q 0.63336,0 0.910071,0.22547 0.27876,0.22547 0.27876,0.73175 0,0.50628 -0.27876,0.73174 -0.276711,0.22547 -0.910071,0.22547 H 13.32687 v 1.14579 h -0.604665 z"
+ style="font-size:4.19780493px;text-align:center;text-anchor:middle;fill:#2a2a2a;fill-opacity:1;stroke-width:0.31483537"
+ id="path823"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
</svg>
diff --git a/src/activities/programmingMaze/resource/instructions/Instruction.qml b/src/activities/programmingMaze/resource/instructions/Instruction.qml
index 16063a07e..a26e83d3f 100644
--- a/src/activities/programmingMaze/resource/instructions/Instruction.qml
+++ b/src/activities/programmingMaze/resource/instructions/Instruction.qml
@@ -1,51 +1,51 @@
/* GCompris - Instruction.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Author:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../programmingMaze.js" as Activity
Item {
id: instruction
//stores the movement animation duration of Tux when an instruction is executed.
property real movementAnimationDuration
/**
* This signal is emitted after the execution of current instruction is complete.
*
* The signal will be caught by ProgrammingMaze.qml/Procedure.qml depending on with whom the connection is made,
* and it will check if Tux has reached the fish(level is complete) or will execute the next instruction.
*/
signal executionComplete
/**
* This signal is emitted if Tux cannot move according to the current executed instruction.
*
* It will be caught by deadEnd() in its parent file.
*/
signal foundDeadEnd
- function setCodeAreaHighlightMoveDuration() {
- Activity.items.mainFunctionCodeArea.highlightMoveDuration = movementAnimationDuration
- Activity.items.procedureCodeArea.highlightMoveDuration = movementAnimationDuration
- }
+// function setCodeAreaHighlightMoveDuration() {
+// Activity.items.mainFunctionCodeArea.highlightMoveDuration = movementAnimationDuration
+// Activity.items.procedureCodeArea.highlightMoveDuration = movementAnimationDuration
+// }
}
diff --git a/src/activities/programmingMaze/resource/instructions/MoveForward.qml b/src/activities/programmingMaze/resource/instructions/MoveForward.qml
index 2a214e42f..55356bb93 100644
--- a/src/activities/programmingMaze/resource/instructions/MoveForward.qml
+++ b/src/activities/programmingMaze/resource/instructions/MoveForward.qml
@@ -1,104 +1,102 @@
/* GCompris - MoveForward.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Author:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../programmingMaze.js" as Activity
Instruction {
id: moveForward
movementAnimationDuration: 2000
property double playerXCoordinate: 0
property double playerYCoordinate: 0
//If there has been an x-axis movement, x co-ordinate will be animated without any effect on y-axis movement and same vice-versa.
ParallelAnimation {
id: movementAnimation
SmoothedAnimation {
target: Activity.items.player
property: 'x'
to: playerXCoordinate
duration: moveForward.movementAnimationDuration
reversingMode: SmoothedAnimation.Immediate
}
SmoothedAnimation {
target: Activity.items.player
property: 'y'
to: playerYCoordinate
duration: moveForward.movementAnimationDuration
reversingMode: SmoothedAnimation.Immediate
}
onStopped: executionComplete()
}
function nextPositionExists(playerCenterX, playerCenterY) {
var playerNextPositionX = Math.floor(playerCenterX / Activity.stepX)
var playerNextPositionY = Math.floor(playerCenterY / Activity.stepY)
var currentLevelCoordinates = Activity.mazeBlocks[Activity.currentLevel].map
for(var i = 0; i < currentLevelCoordinates.length; i++) {
if(currentLevelCoordinates[i].x == playerNextPositionX && currentLevelCoordinates[i].y == playerNextPositionY)
return true
}
return false
}
//Function to check if the current movement is possible or not and then process the instruction accordingly
function checkAndExecuteMovement() {
var currentRotation = Activity.getPlayerRotation()
var playerCenterX = Activity.items.player.playerCenterX
var playerCenterY = Activity.items.player.playerCenterY
var nextTileExists = false
moveForward.playerXCoordinate = Activity.items.player.x
moveForward.playerYCoordinate = Activity.items.player.y
if(currentRotation === Activity.EAST) {
playerCenterX += Activity.stepX
moveForward.playerXCoordinate += Activity.stepX
}
else if(currentRotation === Activity.WEST) {
playerCenterX -= Activity.stepX
moveForward.playerXCoordinate -= Activity.stepX
}
else if(currentRotation === Activity.SOUTH) {
playerCenterY -= Activity.stepY
moveForward.playerYCoordinate -= Activity.stepY
}
else if(currentRotation === Activity.NORTH) {
playerCenterY += Activity.stepY
moveForward.playerYCoordinate += Activity.stepY
}
nextTileExists = nextPositionExists(playerCenterX, playerCenterY)
- setCodeAreaHighlightMoveDuration()
-
if(nextTileExists) {
movementAnimation.start()
}
else
foundDeadEnd()
}
}
diff --git a/src/activities/programmingMaze/resource/instructions/TurnLeftOrRight.qml b/src/activities/programmingMaze/resource/instructions/TurnLeftOrRight.qml
index bb7fad59c..80f7e15e9 100644
--- a/src/activities/programmingMaze/resource/instructions/TurnLeftOrRight.qml
+++ b/src/activities/programmingMaze/resource/instructions/TurnLeftOrRight.qml
@@ -1,55 +1,53 @@
/* GCompris - TurnLeftOrRight.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Author:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../programmingMaze.js" as Activity
Instruction {
id: turnLeftOrRight
movementAnimationDuration: 1000
property real finalRotation: 0
property string turnDirection
RotationAnimation {
id: movementAnimation
target: Activity.items.player
to: finalRotation
duration: turnLeftOrRight.movementAnimationDuration
direction: RotationAnimation.Shortest
onStopped: executionComplete()
}
function checkAndExecuteMovement() {
var currentRotation = Activity.getPlayerRotation()
if(turnLeftOrRight.turnDirection === "turn-left")
Activity.changedRotation = (currentRotation - 90) % 360
else
Activity.changedRotation = (currentRotation + 90) % 360
- setCodeAreaHighlightMoveDuration()
-
turnLeftOrRight.finalRotation = Activity.changedRotation
movementAnimation.start()
}
}
diff --git a/src/activities/programmingMaze/resource/move-forward.svg b/src/activities/programmingMaze/resource/move-forward.svg
index a06c0bc07..4dc3dbbf9 100644
--- a/src/activities/programmingMaze/resource/move-forward.svg
+++ b/src/activities/programmingMaze/resource/move-forward.svg
@@ -1,43 +1,92 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="268.831px" height="268.832px" viewBox="0 0 268.831 268.832" style="enable-background:new 0 0 268.831 268.832;"
- xml:space="preserve">
-<g>
- <path d="M223.255,83.659l-80-79.998c-4.881-4.881-12.797-4.881-17.678,0l-80,80c-4.883,4.882-4.883,12.796,0,17.678
- c2.439,2.44,5.64,3.661,8.839,3.661s6.397-1.221,8.839-3.661l58.661-58.661v213.654c0,6.903,5.597,12.5,12.5,12.5
- c6.901,0,12.5-5.597,12.5-12.5V42.677l58.661,58.659c4.883,4.881,12.797,4.881,17.678,0
- C228.137,96.455,228.137,88.541,223.255,83.659z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ viewBox="0 0 8.4666665 8.4666669"
+ version="1.1"
+ id="svg1475"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="move-forward.svg">
+ <defs
+ id="defs1469" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.9195959"
+ inkscape:cx="6.5156667"
+ inkscape:cy="9.3399563"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2020"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata1472">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-288.53332)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 16,2 8,16 h 6 v 14 h 4 V 16 h 6 z"
+ transform="matrix(0.26458333,0,0,0.26458333,0,288.53332)"
+ id="rect2066"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/activities/programmingMaze/resource/turn-left.svg b/src/activities/programmingMaze/resource/turn-left.svg
index ea81fc8d0..dc50abb30 100644
--- a/src/activities/programmingMaze/resource/turn-left.svg
+++ b/src/activities/programmingMaze/resource/turn-left.svg
@@ -1 +1,91 @@
-<svg id="svg" version="1.1" width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;"><g id="svgg"><path id="path0" d="M196.400 0.400 C 196.400 0.620,196.052 0.800,195.627 0.800 C 195.202 0.800,194.740 1.160,194.600 1.600 C 194.460 2.040,194.100 2.400,193.800 2.400 C 193.500 2.400,193.140 2.760,193.000 3.200 C 192.860 3.640,192.488 4.000,192.173 4.000 C 191.858 4.000,191.600 4.360,191.600 4.800 C 191.600 5.452,191.333 5.600,190.163 5.600 C 189.062 5.600,188.676 5.787,188.516 6.400 C 188.400 6.843,187.970 7.200,187.553 7.200 C 187.067 7.200,186.800 7.483,186.800 8.000 C 186.800 8.533,186.533 8.800,186.000 8.800 C 185.560 8.800,185.200 9.049,185.200 9.353 C 185.200 9.658,184.840 10.001,184.400 10.116 C 183.960 10.231,183.600 10.592,183.600 10.918 C 183.600 11.279,183.052 11.614,182.200 11.774 C 181.362 11.931,180.800 12.270,180.800 12.618 C 180.800 12.942,180.429 13.200,179.963 13.200 C 179.462 13.200,179.041 13.521,178.916 14.000 C 178.801 14.440,178.441 14.800,178.116 14.800 C 177.791 14.800,177.431 15.160,177.316 15.600 C 177.201 16.040,176.870 16.400,176.580 16.400 C 176.291 16.400,175.940 16.760,175.800 17.200 C 175.660 17.640,175.213 18.000,174.806 18.000 C 173.639 18.000,172.800 18.436,172.800 19.043 C 172.800 19.349,172.440 19.600,172.000 19.600 C 171.467 19.600,171.200 19.867,171.200 20.400 C 171.200 20.933,170.933 21.200,170.400 21.200 C 169.867 21.200,169.600 21.467,169.600 22.000 C 169.600 22.533,169.333 22.800,168.800 22.800 C 168.267 22.800,168.000 23.067,168.000 23.600 C 168.000 24.242,167.733 24.400,166.647 24.400 C 165.630 24.400,165.241 24.599,165.084 25.200 C 164.959 25.679,164.538 26.000,164.037 26.000 C 163.577 26.000,163.200 26.249,163.200 26.553 C 163.200 26.858,162.840 27.201,162.400 27.316 C 161.960 27.431,161.600 27.791,161.600 28.116 C 161.600 28.441,161.240 28.801,160.800 28.916 C 160.360 29.031,160.000 29.412,160.000 29.763 C 160.000 30.133,159.665 30.400,159.200 30.400 C 158.760 30.400,158.040 30.760,157.600 31.200 C 157.160 31.640,156.530 32.000,156.200 32.000 C 155.867 32.000,155.600 32.356,155.600 32.800 C 155.600 33.333,155.333 33.600,154.800 33.600 C 154.267 33.600,154.000 33.867,154.000 34.400 C 154.000 34.933,153.733 35.200,153.200 35.200 C 152.667 35.200,152.400 35.467,152.400 36.000 C 152.400 36.624,152.133 36.800,151.187 36.800 C 150.452 36.800,149.880 37.048,149.733 37.431 C 149.600 37.777,149.065 38.223,148.545 38.421 C 148.025 38.618,147.600 39.055,147.600 39.390 C 147.600 39.733,147.250 40.000,146.800 40.000 C 146.267 40.000,146.000 40.267,146.000 40.800 C 146.000 41.333,145.733 41.600,145.200 41.600 C 144.760 41.600,144.400 41.856,144.400 42.168 C 144.400 42.481,143.861 42.855,143.202 42.999 C 142.544 43.144,141.869 43.487,141.702 43.761 C 141.536 44.036,141.085 44.376,140.700 44.518 C 140.315 44.659,140.000 45.051,140.000 45.387 C 140.000 45.733,139.652 46.000,139.200 46.000 C 138.667 46.000,138.400 46.267,138.400 46.800 C 138.400 47.333,138.133 47.600,137.600 47.600 C 137.067 47.600,136.800 47.867,136.800 48.400 C 136.800 48.987,136.533 49.200,135.800 49.200 C 135.250 49.200,134.471 49.529,134.069 49.931 C 133.668 50.332,133.038 50.777,132.669 50.918 C 132.301 51.059,132.000 51.451,132.000 51.787 C 132.000 52.133,131.652 52.400,131.200 52.400 C 130.667 52.400,130.400 52.667,130.400 53.200 C 130.400 53.733,130.133 54.000,129.600 54.000 C 129.067 54.000,128.800 54.267,128.800 54.800 C 128.800 55.428,128.533 55.600,127.563 55.600 C 126.662 55.600,126.268 55.817,126.116 56.400 C 126.000 56.843,125.570 57.200,125.153 57.200 C 124.667 57.200,124.400 57.483,124.400 58.000 C 124.400 58.533,124.133 58.800,123.600 58.800 C 123.156 58.800,122.800 59.067,122.800 59.400 C 122.800 59.733,122.444 60.000,122.000 60.000 C 121.482 60.000,121.200 60.267,121.200 60.755 C 121.200 61.304,120.811 61.584,119.779 61.778 C 118.997 61.924,118.258 62.304,118.136 62.622 C 118.014 62.940,117.647 63.200,117.320 63.200 C 116.993 63.200,116.631 63.560,116.516 64.000 C 116.400 64.443,115.970 64.800,115.553 64.800 C 115.067 64.800,114.800 65.083,114.800 65.600 C 114.800 66.133,114.533 66.400,114.000 66.400 C 113.467 66.400,113.200 66.667,113.200 67.200 C 113.200 67.722,112.933 68.000,112.433 68.000 C 111.241 68.000,110.400 68.431,110.400 69.043 C 110.400 69.349,110.040 69.600,109.600 69.600 C 109.067 69.600,108.800 69.867,108.800 70.400 C 108.800 70.933,108.533 71.200,108.000 71.200 C 107.467 71.200,107.200 71.467,107.200 72.000 C 107.200 72.533,106.933 72.800,106.400 72.800 C 105.867 72.800,105.600 73.067,105.600 73.600 C 105.600 74.245,105.333 74.400,104.227 74.400 C 103.205 74.400,102.789 74.605,102.600 75.200 C 102.460 75.640,101.998 76.000,101.573 76.000 C 101.148 76.000,100.800 76.249,100.800 76.553 C 100.800 76.858,100.440 77.201,100.000 77.316 C 99.560 77.431,99.200 77.812,99.200 78.163 C 99.200 78.533,98.865 78.800,98.400 78.800 C 97.882 78.800,97.600 79.067,97.600 79.555 C 97.600 80.102,97.213 80.384,96.200 80.574 C 95.362 80.731,94.800 81.070,94.800 81.418 C 94.800 81.738,94.440 82.000,94.000 82.000 C 93.467 82.000,93.200 82.267,93.200 82.800 C 93.200 83.333,92.933 83.600,92.400 83.600 C 91.867 83.600,91.600 83.867,91.600 84.400 C 91.600 84.933,91.333 85.200,90.800 85.200 C 90.267 85.200,90.000 85.467,90.000 86.000 C 90.000 86.622,89.733 86.800,88.803 86.800 C 88.040 86.800,87.426 87.090,87.107 87.600 C 86.832 88.040,86.291 88.400,85.904 88.400 C 85.467 88.400,85.200 88.703,85.200 89.200 C 85.200 89.733,84.933 90.000,84.400 90.000 C 83.867 90.000,83.600 90.267,83.600 90.800 C 83.600 91.333,83.333 91.600,82.800 91.600 C 82.360 91.600,82.000 91.862,82.000 92.182 C 82.000 92.530,81.438 92.869,80.600 93.026 C 79.798 93.177,79.200 93.526,79.200 93.845 C 79.200 94.150,78.932 94.400,78.603 94.400 C 78.275 94.400,77.782 94.760,77.507 95.200 C 77.232 95.640,76.781 96.000,76.504 96.000 C 76.227 96.000,76.000 96.287,76.000 96.637 C 76.000 96.988,75.640 97.369,75.200 97.484 C 74.003 97.797,74.003 102.203,75.200 102.516 C 75.640 102.631,76.000 103.012,76.000 103.363 C 76.000 103.713,76.230 104.000,76.511 104.000 C 76.792 104.000,77.326 104.315,77.697 104.700 C 79.244 106.305,79.862 106.750,80.903 107.011 C 81.506 107.163,82.000 107.537,82.000 107.843 C 82.000 108.150,82.360 108.400,82.800 108.400 C 83.333 108.400,83.600 108.667,83.600 109.200 C 83.600 109.733,83.867 110.000,84.400 110.000 C 84.933 110.000,85.200 110.267,85.200 110.800 C 85.200 111.297,85.467 111.600,85.904 111.600 C 86.291 111.600,86.832 111.960,87.107 112.400 C 87.426 112.910,88.040 113.200,88.803 113.200 C 89.733 113.200,90.000 113.378,90.000 114.000 C 90.000 114.533,90.267 114.800,90.800 114.800 C 91.333 114.800,91.600 115.067,91.600 115.600 C 91.600 116.133,91.867 116.400,92.400 116.400 C 92.933 116.400,93.200 116.667,93.200 117.200 C 93.200 117.733,93.467 118.000,94.000 118.000 C 94.440 118.000,94.800 118.262,94.800 118.582 C 94.800 118.930,95.362 119.269,96.200 119.426 C 97.213 119.616,97.600 119.898,97.600 120.445 C 97.600 120.918,97.881 121.200,98.353 121.200 C 98.770 121.200,99.200 121.557,99.316 122.000 C 99.431 122.440,99.812 122.800,100.163 122.800 C 100.513 122.800,100.800 123.070,100.800 123.400 C 100.800 123.730,101.154 124.000,101.586 124.000 C 102.018 124.000,102.565 124.360,102.800 124.800 C 103.080 125.324,103.638 125.600,104.414 125.600 C 105.333 125.600,105.600 125.780,105.600 126.400 C 105.600 126.933,105.867 127.200,106.400 127.200 C 106.933 127.200,107.200 127.467,107.200 128.000 C 107.200 128.533,107.467 128.800,108.000 128.800 C 108.533 128.800,108.800 129.067,108.800 129.600 C 108.800 130.133,109.067 130.400,109.600 130.400 C 110.040 130.400,110.400 130.651,110.400 130.957 C 110.400 131.569,111.241 132.000,112.433 132.000 C 112.933 132.000,113.200 132.278,113.200 132.800 C 113.200 133.333,113.467 133.600,114.000 133.600 C 114.533 133.600,114.800 133.867,114.800 134.400 C 114.800 134.917,115.067 135.200,115.553 135.200 C 115.970 135.200,116.400 135.557,116.516 136.000 C 116.631 136.440,116.993 136.800,117.320 136.800 C 117.647 136.800,118.014 137.060,118.136 137.378 C 118.258 137.696,118.997 138.076,119.779 138.222 C 120.811 138.416,121.200 138.696,121.200 139.245 C 121.200 139.733,121.482 140.000,122.000 140.000 C 122.444 140.000,122.800 140.267,122.800 140.600 C 122.800 140.933,123.156 141.200,123.600 141.200 C 124.133 141.200,124.400 141.467,124.400 142.000 C 124.400 142.533,124.667 142.800,125.200 142.800 C 125.640 142.800,126.000 143.051,126.000 143.357 C 126.000 143.969,126.841 144.400,128.033 144.400 C 128.533 144.400,128.800 144.678,128.800 145.200 C 128.800 145.733,129.067 146.000,129.600 146.000 C 130.133 146.000,130.400 146.267,130.400 146.800 C 130.400 147.317,130.667 147.600,131.153 147.600 C 131.570 147.600,132.000 147.957,132.116 148.400 C 132.241 148.879,132.662 149.200,133.163 149.200 C 133.629 149.200,134.000 149.458,134.000 149.782 C 134.000 150.130,134.562 150.469,135.400 150.626 C 136.413 150.816,136.800 151.098,136.800 151.645 C 136.800 152.133,137.082 152.400,137.600 152.400 C 138.133 152.400,138.400 152.667,138.400 153.200 C 138.400 153.733,138.667 154.000,139.200 154.000 C 139.652 154.000,140.000 154.267,140.000 154.613 C 140.000 154.949,140.315 155.341,140.700 155.482 C 141.085 155.624,141.536 155.964,141.702 156.239 C 141.869 156.513,142.544 156.856,143.202 157.001 C 143.861 157.145,144.400 157.519,144.400 157.832 C 144.400 158.144,144.760 158.400,145.200 158.400 C 145.733 158.400,146.000 158.667,146.000 159.200 C 146.000 159.733,146.267 160.000,146.800 160.000 C 147.250 160.000,147.600 160.267,147.600 160.610 C 147.600 160.945,148.025 161.382,148.545 161.579 C 149.065 161.777,149.600 162.223,149.733 162.569 C 149.880 162.952,150.452 163.200,151.187 163.200 C 152.133 163.200,152.400 163.376,152.400 164.000 C 152.400 164.533,152.667 164.800,153.200 164.800 C 153.733 164.800,154.000 165.067,154.000 165.600 C 154.000 166.133,154.267 166.400,154.800 166.400 C 155.333 166.400,155.600 166.667,155.600 167.200 C 155.600 167.718,155.867 168.000,156.357 168.000 C 156.774 168.000,157.212 168.253,157.330 168.562 C 157.449 168.872,158.098 169.246,158.773 169.394 C 159.483 169.550,160.000 169.919,160.000 170.269 C 160.000 170.602,160.360 170.969,160.800 171.084 C 161.240 171.199,161.600 171.559,161.600 171.884 C 161.600 172.209,161.960 172.569,162.400 172.684 C 162.840 172.799,163.200 173.057,163.200 173.257 C 163.200 173.456,163.650 173.791,164.200 174.000 C 164.750 174.209,165.200 174.655,165.200 174.990 C 165.200 175.420,165.612 175.600,166.600 175.600 C 167.733 175.600,168.000 175.752,168.000 176.400 C 168.000 176.933,168.267 177.200,168.800 177.200 C 169.333 177.200,169.600 177.467,169.600 178.000 C 169.600 178.533,169.867 178.800,170.400 178.800 C 170.933 178.800,171.200 179.067,171.200 179.600 C 171.200 180.044,171.467 180.400,171.800 180.400 C 172.130 180.400,172.760 180.760,173.200 181.200 C 173.640 181.640,174.348 182.000,174.773 182.000 C 175.198 182.000,175.660 182.360,175.800 182.800 C 175.940 183.240,176.312 183.600,176.627 183.600 C 176.942 183.600,177.200 183.876,177.200 184.213 C 177.200 184.549,177.515 184.943,177.900 185.086 C 178.285 185.230,178.835 185.674,179.123 186.074 C 179.410 186.473,179.815 186.800,180.023 186.800 C 180.230 186.800,180.760 187.160,181.200 187.600 C 181.640 188.040,182.360 188.400,182.800 188.400 C 183.265 188.400,183.600 188.667,183.600 189.037 C 183.600 189.388,183.960 189.769,184.400 189.884 C 184.840 189.999,185.200 190.342,185.200 190.647 C 185.200 190.951,185.560 191.200,186.000 191.200 C 186.533 191.200,186.800 191.467,186.800 192.000 C 186.800 192.497,187.067 192.800,187.504 192.800 C 187.891 192.800,188.432 193.160,188.707 193.600 C 189.026 194.110,189.640 194.400,190.403 194.400 C 191.333 194.400,191.600 194.578,191.600 195.200 C 191.600 195.640,191.858 196.000,192.173 196.000 C 192.488 196.000,192.860 196.360,193.000 196.800 C 193.140 197.240,193.500 197.600,193.800 197.600 C 194.100 197.600,194.460 197.960,194.600 198.400 C 194.740 198.840,195.202 199.200,195.627 199.200 C 196.052 199.200,196.400 199.451,196.400 199.757 C 196.400 200.477,197.278 200.800,199.233 200.800 L 200.800 200.800 200.800 163.900 L 200.799 127.000 209.400 127.115 C 217.639 127.225,218.000 127.263,218.000 128.015 C 218.000 128.743,218.292 128.800,222.000 128.800 C 225.733 128.800,226.000 128.853,226.000 129.600 C 226.000 130.302,226.267 130.400,228.186 130.400 C 229.962 130.400,230.452 130.550,230.800 131.200 C 231.135 131.827,231.638 132.000,233.118 132.000 C 234.574 132.000,235.122 132.183,235.507 132.800 C 235.898 133.426,236.440 133.600,238.003 133.600 C 239.733 133.600,240.000 133.707,240.000 134.400 C 240.000 135.067,240.267 135.200,241.600 135.200 C 242.667 135.200,243.467 135.467,244.000 136.000 C 244.485 136.485,245.333 136.800,246.153 136.800 C 247.170 136.800,247.559 136.999,247.716 137.600 C 247.875 138.206,248.262 138.400,249.316 138.400 C 250.370 138.400,250.757 138.594,250.916 139.200 C 251.031 139.640,251.457 140.006,251.863 140.013 C 252.268 140.020,252.949 140.290,253.376 140.613 C 253.804 140.936,254.479 141.200,254.876 141.200 C 255.333 141.200,255.600 141.495,255.600 142.000 C 255.600 142.667,255.867 142.800,257.200 142.800 C 258.533 142.800,258.800 142.933,258.800 143.600 C 258.800 144.117,259.067 144.400,259.553 144.400 C 259.970 144.400,260.400 144.757,260.516 145.200 C 260.668 145.783,261.062 146.000,261.963 146.000 C 262.933 146.000,263.200 146.172,263.200 146.800 C 263.200 147.317,263.467 147.600,263.953 147.600 C 264.370 147.600,264.800 147.957,264.916 148.400 C 265.076 149.013,265.462 149.200,266.563 149.200 C 267.733 149.200,268.000 149.348,268.000 150.000 C 268.000 150.533,268.267 150.800,268.800 150.800 C 269.333 150.800,269.600 151.067,269.600 151.600 C 269.600 152.133,269.867 152.400,270.400 152.400 C 270.865 152.400,271.200 152.667,271.200 153.037 C 271.200 153.388,271.560 153.769,272.000 153.884 C 272.440 153.999,272.800 154.330,272.800 154.620 C 272.800 154.909,273.160 155.260,273.600 155.400 C 274.040 155.540,274.400 155.912,274.400 156.227 C 274.400 156.542,274.760 156.800,275.200 156.800 C 275.665 156.800,276.000 157.067,276.000 157.437 C 276.000 157.788,276.360 158.169,276.800 158.284 C 277.240 158.399,277.600 158.736,277.600 159.033 C 277.600 159.329,277.960 159.765,278.400 160.000 C 278.840 160.235,279.200 160.692,279.200 161.014 C 279.200 161.336,279.458 161.600,279.773 161.600 C 280.088 161.600,280.460 161.960,280.600 162.400 C 280.740 162.840,281.112 163.200,281.427 163.200 C 281.742 163.200,282.000 163.487,282.000 163.837 C 282.000 164.188,282.360 164.569,282.800 164.684 C 283.243 164.800,283.600 165.230,283.600 165.647 C 283.600 166.133,283.883 166.400,284.400 166.400 C 284.933 166.400,285.200 166.667,285.200 167.200 C 285.200 167.733,285.467 168.000,286.000 168.000 C 286.497 168.000,286.800 168.267,286.800 168.704 C 286.800 169.091,287.160 169.632,287.600 169.907 C 288.040 170.182,288.400 170.834,288.400 171.357 C 288.400 171.970,288.683 172.381,289.200 172.516 C 289.640 172.631,290.000 173.000,290.000 173.336 C 290.000 173.671,290.360 174.060,290.800 174.200 C 291.240 174.340,291.600 174.789,291.600 175.199 C 291.600 176.135,293.247 178.760,293.849 178.783 C 294.096 178.792,294.413 179.520,294.554 180.400 C 294.719 181.435,295.020 182.000,295.405 182.000 C 295.733 182.000,296.000 182.358,296.000 182.800 C 296.000 183.240,296.360 183.960,296.800 184.400 C 297.240 184.840,297.600 185.560,297.600 186.000 C 297.600 186.533,297.867 186.800,298.400 186.800 C 299.052 186.800,299.200 187.067,299.200 188.237 C 299.200 189.308,299.392 189.725,299.952 189.872 C 300.506 190.016,300.758 190.549,300.909 191.894 C 301.032 192.985,301.374 193.866,301.758 194.080 C 302.178 194.316,302.400 194.985,302.400 196.020 C 302.400 197.333,302.535 197.600,303.200 197.600 C 303.893 197.600,304.000 197.867,304.000 199.586 C 304.000 201.162,304.165 201.660,304.800 202.000 C 305.438 202.342,305.600 202.838,305.600 204.452 C 305.600 206.138,305.733 206.510,306.400 206.684 C 307.084 206.863,307.200 207.230,307.200 209.213 C 307.200 210.538,307.388 211.596,307.638 211.679 C 308.190 211.863,308.760 214.760,308.783 217.500 C 308.795 218.991,308.957 219.600,309.342 219.600 C 309.775 219.600,309.926 221.386,310.096 228.500 C 310.395 241.007,310.020 255.600,309.400 255.600 C 309.081 255.600,308.836 256.776,308.672 259.096 C 308.499 261.553,308.243 262.725,307.813 263.040 C 307.390 263.349,307.200 264.175,307.200 265.697 C 307.200 267.570,307.078 267.939,306.400 268.116 C 305.723 268.293,305.600 268.662,305.600 270.516 C 305.600 272.370,305.477 272.739,304.800 272.916 C 304.134 273.090,304.000 273.462,304.000 275.136 C 304.000 276.795,303.860 277.190,303.200 277.400 C 302.579 277.597,302.400 278.005,302.400 279.227 C 302.400 280.300,302.224 280.800,301.847 280.800 C 301.216 280.800,300.813 282.000,300.805 283.900 C 300.801 284.932,300.635 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.935 288.400,297.600 288.667,297.600 289.037 C 297.600 289.387,297.240 290.131,296.800 290.691 C 296.360 291.250,296.000 292.044,296.000 292.454 C 296.000 292.864,295.749 293.200,295.443 293.200 C 294.831 293.200,294.400 294.041,294.400 295.233 C 294.400 295.655,294.133 296.000,293.808 296.000 C 293.482 296.000,293.102 296.450,292.964 297.000 C 292.826 297.550,292.463 298.000,292.157 298.000 C 291.787 298.000,291.600 298.471,291.600 299.400 C 291.600 300.533,291.448 300.800,290.800 300.800 C 290.267 300.800,290.000 301.067,290.000 301.600 C 290.000 302.133,289.733 302.400,289.200 302.400 C 288.578 302.400,288.400 302.667,288.400 303.597 C 288.400 304.360,288.110 304.974,287.600 305.293 C 287.160 305.568,286.800 306.109,286.800 306.496 C 286.800 306.933,286.497 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.935 308.800,283.600 309.067,283.600 309.437 C 283.600 309.788,283.240 310.169,282.800 310.284 C 282.360 310.399,282.000 310.676,282.000 310.899 C 282.000 311.123,281.370 311.900,280.600 312.626 C 279.830 313.352,279.200 314.126,279.200 314.346 C 279.200 314.566,278.840 314.860,278.400 315.000 C 277.960 315.140,277.600 315.491,277.600 315.780 C 277.600 316.070,277.240 316.401,276.800 316.516 C 276.360 316.631,276.000 316.991,276.000 317.316 C 276.000 317.641,275.640 318.001,275.200 318.116 C 274.760 318.231,274.400 318.612,274.400 318.963 C 274.400 319.333,274.065 319.600,273.600 319.600 C 273.067 319.600,272.800 319.867,272.800 320.400 C 272.800 320.933,272.533 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.118,269.333 324.400,268.843 324.400 C 268.426 324.400,267.988 324.653,267.870 324.962 C 267.751 325.272,267.103 325.646,266.429 325.794 C 265.756 325.941,265.069 326.287,264.902 326.561 C 264.736 326.836,264.285 327.176,263.900 327.318 C 263.515 327.459,263.200 327.831,263.200 328.143 C 263.200 328.475,262.619 328.820,261.800 328.974 C 260.962 329.131,260.400 329.470,260.400 329.818 C 260.400 330.138,260.040 330.400,259.600 330.400 C 259.067 330.400,258.800 330.667,258.800 331.200 C 258.800 331.852,258.533 332.000,257.363 332.000 C 256.262 332.000,255.876 332.187,255.716 332.800 C 255.600 333.243,255.170 333.600,254.753 333.600 C 254.339 333.600,253.640 333.960,253.200 334.400 C 252.760 334.840,252.083 335.200,251.696 335.200 C 251.309 335.200,250.768 335.560,250.493 336.000 C 250.174 336.510,249.560 336.800,248.797 336.800 C 247.867 336.800,247.600 336.978,247.600 337.600 C 247.600 338.261,247.333 338.400,246.062 338.400 C 245.032 338.400,244.285 338.664,243.800 339.200 C 243.315 339.736,242.568 340.000,241.538 340.000 C 240.267 340.000,240.000 340.139,240.000 340.800 C 240.000 341.502,239.733 341.600,237.820 341.600 C 236.415 341.600,235.526 341.792,235.320 342.140 C 235.144 342.436,234.106 342.798,233.014 342.944 C 231.903 343.092,230.880 343.471,230.694 343.804 C 230.465 344.213,229.706 344.400,228.276 344.400 C 226.626 344.400,226.089 344.566,225.693 345.200 C 225.256 345.899,224.760 346.000,221.759 346.000 C 218.662 346.000,218.305 346.078,218.116 346.800 C 217.916 347.566,217.570 347.600,209.986 347.600 C 201.767 347.600,200.800 347.710,200.800 348.643 C 200.800 348.949,200.440 349.200,200.000 349.200 C 199.560 349.200,199.200 348.949,199.200 348.643 C 199.200 347.710,198.233 347.600,190.014 347.600 C 182.430 347.600,182.084 347.566,181.884 346.800 C 181.695 346.078,181.338 346.000,178.241 346.000 C 175.240 346.000,174.744 345.899,174.307 345.200 C 173.911 344.566,173.374 344.400,171.724 344.400 C 170.294 344.400,169.535 344.213,169.306 343.804 C 169.120 343.471,168.097 343.092,166.986 342.944 C 165.894 342.798,164.856 342.436,164.680 342.140 C 164.474 341.792,163.585 341.600,162.180 341.600 C 160.267 341.600,160.000 341.502,160.000 340.800 C 160.000 340.137,159.733 340.000,158.447 340.000 C 157.230 340.000,156.848 339.827,156.684 339.200 C 156.509 338.532,156.138 338.400,154.437 338.400 C 152.667 338.400,152.400 338.295,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.467,148.933 335.200,148.400 335.200 C 147.960 335.200,147.240 334.840,146.800 334.400 C 146.360 333.960,145.661 333.600,145.247 333.600 C 144.830 333.600,144.400 333.243,144.284 332.800 C 144.124 332.187,143.738 332.000,142.637 332.000 C 141.467 332.000,141.200 331.852,141.200 331.200 C 141.200 330.756,140.933 330.400,140.600 330.400 C 140.270 330.400,139.640 330.040,139.200 329.600 C 138.760 329.160,138.040 328.800,137.600 328.800 C 137.135 328.800,136.800 328.533,136.800 328.163 C 136.800 327.812,136.440 327.431,136.000 327.316 C 135.560 327.201,135.200 326.942,135.200 326.741 C 135.200 326.540,134.885 326.260,134.500 326.119 C 134.115 325.979,133.371 325.534,132.846 325.132 C 132.321 324.729,131.556 324.400,131.146 324.400 C 130.667 324.400,130.400 324.114,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.867 319.600,125.600 319.333,125.600 318.800 C 125.600 318.267,125.333 318.000,124.800 318.000 C 124.335 318.000,124.000 317.733,124.000 317.363 C 124.000 317.012,123.640 316.631,123.200 316.516 C 122.760 316.401,122.400 316.058,122.400 315.753 C 122.400 315.449,122.124 315.200,121.787 315.200 C 121.451 315.200,121.055 314.885,120.908 314.500 C 120.761 314.115,120.046 313.239,119.320 312.553 C 118.594 311.867,118.000 311.123,118.000 310.899 C 118.000 310.676,117.640 310.399,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.503 307.200,113.200 306.933,113.200 306.496 C 113.200 306.109,112.840 305.568,112.400 305.293 C 111.935 305.003,111.600 304.360,111.600 303.759 C 111.600 303.062,111.340 302.657,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.552 300.800,108.400 300.533,108.400 299.400 C 108.400 298.471,108.213 298.000,107.843 298.000 C 107.537 298.000,107.174 297.550,107.036 297.000 C 106.898 296.450,106.518 296.000,106.192 296.000 C 105.867 296.000,105.600 295.655,105.600 295.233 C 105.600 294.041,105.169 293.200,104.557 293.200 C 104.251 293.200,104.000 292.864,104.000 292.454 C 104.000 292.044,103.640 291.250,103.200 290.691 C 102.760 290.131,102.400 289.431,102.400 289.133 C 102.400 288.836,102.040 288.368,101.600 288.093 C 101.090 287.774,100.800 287.160,100.800 286.397 C 100.800 285.467,100.622 285.200,100.000 285.200 C 99.365 285.200,99.199 284.932,99.195 283.900 C 99.187 282.000,98.784 280.800,98.153 280.800 C 97.776 280.800,97.600 280.300,97.600 279.227 C 97.600 278.005,97.421 277.597,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.527 272.740,94.400 272.370,94.400 270.580 C 94.400 268.805,94.268 268.412,93.600 268.200 C 92.926 267.986,92.800 267.595,92.800 265.717 C 92.800 264.177,92.611 263.350,92.187 263.040 C 91.757 262.725,91.501 261.553,91.328 259.096 C 91.164 256.771,90.920 255.600,90.599 255.600 C 90.243 255.600,90.061 253.269,89.905 246.729 C 89.716 238.778,89.619 237.803,88.970 237.329 C 88.388 236.903,83.221 236.800,62.524 236.800 L 36.800 236.800 36.800 248.304 C 36.800 259.374,36.830 259.826,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.528 277.200,41.600 277.467,41.600 280.180 C 41.600 282.268,41.763 283.256,42.143 283.480 C 42.442 283.656,42.784 284.689,42.903 285.776 C 43.028 286.917,43.389 287.949,43.759 288.220 C 44.191 288.535,44.400 289.307,44.400 290.582 C 44.400 292.138,44.542 292.512,45.200 292.684 C 45.813 292.845,46.001 293.232,46.005 294.347 C 46.013 296.391,46.400 297.600,47.047 297.600 C 47.426 297.600,47.600 298.104,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.067 300.800,49.200 301.067,49.200 302.400 C 49.200 303.467,49.467 304.267,50.000 304.800 C 50.455 305.255,50.800 306.133,50.800 306.837 C 50.800 307.738,51.017 308.132,51.600 308.284 C 52.206 308.443,52.400 308.830,52.400 309.884 C 52.400 310.938,52.594 311.325,53.200 311.484 C 53.806 311.643,54.000 312.030,54.000 313.084 C 54.000 314.138,54.194 314.525,54.800 314.684 C 55.364 314.832,55.600 315.230,55.600 316.033 C 55.600 316.762,55.887 317.326,56.400 317.600 C 56.840 317.835,57.200 318.361,57.200 318.767 C 57.200 319.174,57.560 319.601,58.000 319.716 C 58.585 319.869,58.800 320.262,58.800 321.175 C 58.800 321.907,59.044 322.519,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 62.979 327.200,63.200 327.467,63.200 328.167 C 63.200 329.548,63.598 330.400,64.243 330.400 C 64.549 330.400,64.800 330.760,64.800 331.200 C 64.800 331.718,65.067 332.000,65.555 332.000 C 66.102 332.000,66.384 332.387,66.574 333.400 C 66.731 334.238,67.070 334.800,67.418 334.800 C 67.742 334.800,68.000 335.171,68.000 335.637 C 68.000 336.138,68.321 336.559,68.800 336.684 C 69.243 336.800,69.600 337.230,69.600 337.647 C 69.600 338.133,69.883 338.400,70.400 338.400 C 70.924 338.400,71.200 338.667,71.200 339.173 C 71.200 339.598,71.560 340.060,72.000 340.200 C 72.560 340.378,72.800 340.805,72.800 341.627 C 72.800 342.533,72.982 342.800,73.600 342.800 C 74.117 342.800,74.400 343.067,74.400 343.553 C 74.400 343.970,74.757 344.400,75.200 344.516 C 75.640 344.631,76.000 345.012,76.000 345.363 C 76.000 345.713,76.270 346.000,76.600 346.000 C 76.930 346.000,77.200 346.287,77.200 346.637 C 77.200 346.988,77.560 347.369,78.000 347.484 C 78.443 347.600,78.800 348.030,78.800 348.447 C 78.800 348.933,79.083 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.333 360.000,91.600 360.267,91.600 360.800 C 91.600 361.333,91.867 361.600,92.400 361.600 C 92.917 361.600,93.200 361.867,93.200 362.353 C 93.200 362.770,93.557 363.200,94.000 363.316 C 94.440 363.431,94.800 363.812,94.800 364.163 C 94.800 364.575,95.151 364.800,95.797 364.800 C 96.360 364.800,97.010 365.148,97.293 365.600 C 97.568 366.040,98.109 366.400,98.496 366.400 C 98.933 366.400,99.200 366.703,99.200 367.200 C 99.200 367.733,99.467 368.000,100.000 368.000 C 100.450 368.000,100.800 368.267,100.800 368.610 C 100.800 368.945,101.250 369.391,101.800 369.600 C 102.350 369.809,102.800 370.156,102.800 370.372 C 102.800 370.587,103.430 370.882,104.200 371.026 C 105.052 371.186,105.600 371.521,105.600 371.882 C 105.600 372.208,105.960 372.569,106.400 372.684 C 106.840 372.799,107.200 373.122,107.200 373.402 C 107.200 373.682,107.813 374.026,108.561 374.166 C 109.310 374.307,110.024 374.687,110.149 375.011 C 110.273 375.335,110.741 375.600,111.187 375.600 C 111.733 375.600,112.000 375.863,112.000 376.400 C 112.000 377.048,112.267 377.200,113.400 377.200 C 114.533 377.200,114.800 377.352,114.800 378.000 C 114.800 378.667,115.067 378.800,116.400 378.800 C 117.733 378.800,118.000 378.933,118.000 379.600 C 118.000 380.097,118.267 380.400,118.704 380.400 C 119.091 380.400,119.632 380.760,119.907 381.200 C 120.219 381.699,120.840 382.000,121.557 382.000 C 122.370 382.000,122.768 382.234,122.916 382.800 C 123.075 383.406,123.462 383.600,124.516 383.600 C 125.570 383.600,125.957 383.794,126.116 384.400 C 126.276 385.013,126.662 385.200,127.763 385.200 C 128.754 385.200,129.200 385.381,129.200 385.782 C 129.200 386.134,129.774 386.471,130.655 386.637 C 131.455 386.787,132.445 387.245,132.855 387.655 C 133.333 388.133,134.173 388.400,135.200 388.400 C 136.301 388.400,136.800 388.574,136.800 388.957 C 136.800 389.602,137.652 390.000,139.033 390.000 C 139.626 390.000,140.000 390.232,140.000 390.600 C 140.000 391.044,140.467 391.200,141.800 391.200 C 143.067 391.200,143.837 391.437,144.400 392.000 C 144.987 392.587,145.733 392.800,147.200 392.800 C 148.933 392.800,149.200 392.907,149.200 393.600 C 149.200 394.309,149.467 394.400,151.553 394.400 C 153.570 394.400,153.937 394.514,154.116 395.200 C 154.302 395.911,154.662 396.000,157.363 396.000 C 160.133 396.000,160.400 396.070,160.400 396.800 C 160.400 397.537,160.667 397.600,163.797 397.600 C 166.760 397.600,167.257 397.702,167.693 398.400 C 168.144 399.123,168.626 399.200,172.696 399.200 C 175.432 399.200,177.200 399.357,177.200 399.600 C 177.200 399.862,185.067 400.000,200.000 400.000 C 214.933 400.000,222.800 399.862,222.800 399.600 C 222.800 399.357,224.568 399.200,227.304 399.200 C 231.374 399.200,231.856 399.123,232.307 398.400 C 232.743 397.702,233.240 397.600,236.203 397.600 C 239.333 397.600,239.600 397.537,239.600 396.800 C 239.600 396.070,239.867 396.000,242.637 396.000 C 245.338 396.000,245.698 395.911,245.884 395.200 C 246.063 394.514,246.430 394.400,248.447 394.400 C 250.533 394.400,250.800 394.309,250.800 393.600 C 250.800 392.901,251.067 392.800,252.911 392.800 C 254.527 392.800,255.183 392.612,255.707 392.000 C 256.204 391.420,256.887 391.200,258.196 391.200 C 259.533 391.200,260.000 391.045,260.000 390.600 C 260.000 390.178,260.426 390.000,261.437 390.000 C 262.538 390.000,262.924 389.813,263.084 389.200 C 263.248 388.573,263.630 388.400,264.847 388.400 C 265.867 388.400,266.675 388.125,267.200 387.600 C 267.640 387.160,268.452 386.800,269.004 386.800 C 269.556 386.800,270.316 386.440,270.693 386.000 C 271.083 385.545,271.873 385.200,272.526 385.200 C 273.338 385.200,273.736 384.966,273.884 384.400 C 274.043 383.794,274.430 383.600,275.484 383.600 C 276.538 383.600,276.925 383.406,277.084 382.800 C 277.232 382.234,277.630 382.000,278.443 382.000 C 279.160 382.000,279.781 381.699,280.093 381.200 C 280.368 380.760,280.909 380.400,281.296 380.400 C 281.733 380.400,282.000 380.097,282.000 379.600 C 282.000 378.933,282.267 378.800,283.600 378.800 C 284.933 378.800,285.200 378.667,285.200 378.000 C 285.200 377.352,285.467 377.200,286.600 377.200 C 287.733 377.200,288.000 377.048,288.000 376.400 C 288.000 375.863,288.267 375.600,288.813 375.600 C 289.259 375.600,289.727 375.335,289.851 375.011 C 289.976 374.687,290.690 374.307,291.439 374.166 C 292.187 374.026,292.800 373.682,292.800 373.402 C 292.800 373.122,293.160 372.799,293.600 372.684 C 294.040 372.569,294.400 372.208,294.400 371.882 C 294.400 371.521,294.948 371.186,295.800 371.026 C 296.570 370.882,297.200 370.587,297.200 370.372 C 297.200 370.156,297.650 369.809,298.200 369.600 C 298.750 369.391,299.200 368.945,299.200 368.610 C 299.200 368.267,299.550 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.689,301.067 366.400,301.538 366.400 C 301.944 366.400,302.602 366.040,303.000 365.600 C 303.398 365.160,304.056 364.800,304.462 364.800 C 304.871 364.800,305.200 364.515,305.200 364.163 C 305.200 363.812,305.560 363.431,306.000 363.316 C 306.440 363.201,306.800 362.841,306.800 362.516 C 306.800 362.191,307.160 361.831,307.600 361.716 C 308.043 361.600,308.400 361.170,308.400 360.753 C 308.400 360.267,308.683 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.151,311.600 357.847 C 311.600 357.542,311.960 357.199,312.400 357.084 C 312.840 356.969,313.200 356.588,313.200 356.237 C 313.200 355.867,313.535 355.600,314.000 355.600 C 314.533 355.600,314.800 355.333,314.800 354.800 C 314.800 354.267,315.067 354.000,315.600 354.000 C 316.133 354.000,316.400 353.733,316.400 353.200 C 316.400 352.667,316.667 352.400,317.200 352.400 C 317.733 352.400,318.000 352.133,318.000 351.600 C 318.000 351.067,318.267 350.800,318.800 350.800 C 319.333 350.800,319.600 350.533,319.600 350.000 C 319.600 349.467,319.867 349.200,320.400 349.200 C 320.917 349.200,321.200 348.933,321.200 348.447 C 321.200 348.030,321.557 347.600,322.000 347.484 C 322.440 347.369,322.800 346.988,322.800 346.637 C 322.800 346.287,323.070 346.000,323.400 346.000 C 323.730 346.000,324.000 345.713,324.000 345.363 C 324.000 345.012,324.360 344.631,324.800 344.516 C 325.243 344.400,325.600 343.970,325.600 343.553 C 325.600 343.067,325.883 342.800,326.400 342.800 C 327.018 342.800,327.200 342.533,327.200 341.627 C 327.200 340.805,327.440 340.378,328.000 340.200 C 328.440 340.060,328.800 339.598,328.800 339.173 C 328.800 338.667,329.076 338.400,329.600 338.400 C 330.117 338.400,330.400 338.133,330.400 337.647 C 330.400 337.230,330.757 336.800,331.200 336.684 C 331.679 336.559,332.000 336.138,332.000 335.637 C 332.000 335.171,332.258 334.800,332.582 334.800 C 332.930 334.800,333.269 334.238,333.426 333.400 C 333.616 332.387,333.898 332.000,334.445 332.000 C 334.933 332.000,335.200 331.718,335.200 331.200 C 335.200 330.760,335.451 330.400,335.757 330.400 C 336.402 330.400,336.800 329.548,336.800 328.167 C 336.800 327.467,337.021 327.200,337.600 327.200 C 338.133 327.200,338.400 326.933,338.400 326.400 C 338.400 325.960,338.650 325.600,338.955 325.600 C 339.271 325.600,339.621 325.011,339.766 324.239 C 339.907 323.490,340.287 322.776,340.611 322.651 C 340.956 322.519,341.200 321.907,341.200 321.175 C 341.200 320.262,341.415 319.869,342.000 319.716 C 342.440 319.601,342.800 319.174,342.800 318.767 C 342.800 318.361,343.160 317.835,343.600 317.600 C 344.113 317.326,344.400 316.762,344.400 316.033 C 344.400 315.230,344.636 314.832,345.200 314.684 C 345.806 314.525,346.000 314.138,346.000 313.084 C 346.000 312.030,346.194 311.643,346.800 311.484 C 347.406 311.325,347.600 310.938,347.600 309.884 C 347.600 308.830,347.794 308.443,348.400 308.284 C 348.983 308.132,349.200 307.738,349.200 306.837 C 349.200 306.133,349.545 305.255,350.000 304.800 C 350.533 304.267,350.800 303.467,350.800 302.400 C 350.800 301.067,350.933 300.800,351.600 300.800 C 352.248 300.800,352.400 300.533,352.400 299.400 C 352.400 298.533,352.705 297.695,353.200 297.200 C 353.757 296.643,354.000 295.867,354.000 294.647 C 354.000 293.230,354.153 292.853,354.800 292.684 C 355.458 292.512,355.600 292.138,355.600 290.582 C 355.600 289.307,355.809 288.535,356.241 288.220 C 356.611 287.949,356.972 286.917,357.097 285.776 C 357.216 284.689,357.558 283.656,357.857 283.480 C 358.237 283.256,358.400 282.268,358.400 280.180 C 358.400 277.467,358.472 277.200,359.200 277.200 C 359.937 277.200,360.000 276.933,360.000 273.803 C 360.000 270.840,360.102 270.343,360.800 269.907 C 361.519 269.458,361.600 268.974,361.600 265.107 C 361.600 261.240,361.681 260.756,362.400 260.307 C 363.185 259.817,363.200 259.374,363.200 237.400 C 363.200 215.426,363.185 214.983,362.400 214.493 C 361.685 214.046,361.600 213.560,361.600 209.893 C 361.600 206.226,361.515 205.740,360.800 205.293 C 360.101 204.856,360.000 204.360,360.000 201.359 C 360.000 198.262,359.922 197.905,359.200 197.716 C 358.491 197.531,358.400 197.170,358.400 194.553 C 358.400 192.195,358.279 191.600,357.800 191.600 C 357.374 191.600,357.198 191.164,357.195 190.100 C 357.187 188.011,356.805 186.800,356.153 186.800 C 355.766 186.800,355.600 186.271,355.600 185.033 C 355.600 182.886,355.296 182.000,354.557 182.000 C 354.196 182.000,353.998 181.542,353.995 180.700 C 353.987 178.800,353.584 177.600,352.953 177.600 C 352.574 177.600,352.400 177.096,352.400 176.000 C 352.400 174.703,352.258 174.400,351.651 174.400 C 351.042 174.400,350.865 174.017,350.704 172.346 C 350.577 171.017,350.276 170.162,349.854 169.926 C 349.441 169.695,349.200 169.038,349.200 168.143 C 349.200 167.062,349.010 166.675,348.400 166.516 C 347.803 166.360,347.600 165.970,347.600 164.980 C 347.600 164.005,347.388 163.587,346.800 163.400 C 346.205 163.211,346.000 162.795,346.000 161.773 C 346.000 160.667,345.845 160.400,345.200 160.400 C 344.548 160.400,344.400 160.133,344.400 158.963 C 344.400 157.862,344.213 157.476,343.600 157.316 C 343.157 157.200,342.800 156.770,342.800 156.353 C 342.800 155.939,342.549 155.600,342.243 155.600 C 341.598 155.600,341.200 154.748,341.200 153.367 C 341.200 152.809,340.965 152.400,340.645 152.400 C 340.327 152.400,339.977 151.804,339.828 151.011 C 339.685 150.247,339.336 149.482,339.054 149.311 C 338.771 149.140,338.424 148.685,338.282 148.300 C 338.141 147.915,337.749 147.600,337.413 147.600 C 337.000 147.600,336.800 147.212,336.800 146.414 C 336.800 145.638,336.524 145.080,336.000 144.800 C 335.560 144.565,335.200 144.120,335.200 143.813 C 335.200 143.505,334.853 143.144,334.428 143.009 C 333.989 142.870,333.541 142.242,333.390 141.555 C 333.244 140.890,332.872 140.249,332.562 140.130 C 332.253 140.012,332.000 139.574,332.000 139.157 C 332.000 138.667,331.718 138.400,331.200 138.400 C 330.667 138.400,330.400 138.133,330.400 137.600 C 330.400 137.067,330.133 136.800,329.600 136.800 C 329.067 136.800,328.800 136.533,328.800 136.000 C 328.800 135.560,328.440 134.840,328.000 134.400 C 327.560 133.960,327.200 133.313,327.200 132.963 C 327.200 132.612,326.840 132.231,326.400 132.116 C 325.957 132.000,325.600 131.570,325.600 131.153 C 325.600 130.667,325.317 130.400,324.800 130.400 C 324.267 130.400,324.000 130.133,324.000 129.600 C 324.000 129.160,323.751 128.800,323.447 128.800 C 323.142 128.800,322.799 128.440,322.684 128.000 C 322.569 127.560,322.188 127.200,321.837 127.200 C 321.487 127.200,321.200 126.942,321.200 126.627 C 321.200 126.312,320.840 125.940,320.400 125.800 C 319.960 125.660,319.600 125.288,319.600 124.973 C 319.600 124.658,319.240 124.400,318.800 124.400 C 318.267 124.400,318.000 124.133,318.000 123.600 C 318.000 123.067,317.733 122.800,317.200 122.800 C 316.667 122.800,316.400 122.533,316.400 122.000 C 316.400 121.467,316.133 121.200,315.600 121.200 C 315.067 121.200,314.800 120.933,314.800 120.400 C 314.800 119.867,314.533 119.600,314.000 119.600 C 313.467 119.600,313.200 119.333,313.200 118.800 C 313.200 118.267,312.933 118.000,312.400 118.000 C 311.867 118.000,311.600 117.733,311.600 117.200 C 311.600 116.667,311.333 116.400,310.800 116.400 C 310.267 116.400,310.000 116.133,310.000 115.600 C 310.000 115.067,309.733 114.800,309.200 114.800 C 308.667 114.800,308.400 114.533,308.400 114.000 C 308.400 113.467,308.133 113.200,307.600 113.200 C 307.160 113.200,306.800 112.996,306.800 112.746 C 306.800 112.302,304.970 110.400,304.542 110.400 C 304.424 110.400,303.869 110.040,303.309 109.600 C 302.750 109.160,301.956 108.800,301.546 108.800 C 301.067 108.800,300.800 108.514,300.800 108.000 C 300.800 107.467,300.533 107.200,300.000 107.200 C 299.467 107.200,299.200 106.933,299.200 106.400 C 299.200 105.903,298.933 105.600,298.496 105.600 C 298.109 105.600,297.568 105.240,297.293 104.800 C 296.974 104.290,296.360 104.000,295.597 104.000 C 294.667 104.000,294.400 103.822,294.400 103.200 C 294.400 102.683,294.133 102.400,293.647 102.400 C 293.230 102.400,292.800 102.043,292.684 101.600 C 292.534 101.026,292.138 100.800,291.284 100.800 C 290.430 100.800,290.034 100.574,289.884 100.000 C 289.759 99.521,289.338 99.200,288.837 99.200 C 288.377 99.200,288.000 98.949,288.000 98.643 C 288.000 98.040,287.162 97.600,286.014 97.600 C 285.618 97.600,285.199 97.240,285.084 96.800 C 284.924 96.187,284.538 96.000,283.437 96.000 C 282.267 96.000,282.000 95.852,282.000 95.200 C 282.000 94.682,281.733 94.400,281.243 94.400 C 280.826 94.400,280.386 94.140,280.264 93.822 C 280.142 93.504,279.403 93.124,278.621 92.978 C 277.803 92.824,277.200 92.475,277.200 92.155 C 277.200 91.774,276.699 91.600,275.600 91.600 C 274.267 91.600,274.000 91.467,274.000 90.800 C 274.000 90.155,273.733 90.000,272.627 90.000 C 271.605 90.000,271.189 89.795,271.000 89.200 C 270.811 88.605,270.395 88.400,269.373 88.400 C 268.533 88.400,267.689 88.089,267.200 87.600 C 266.667 87.067,265.867 86.800,264.800 86.800 C 263.467 86.800,263.200 86.667,263.200 86.000 C 263.200 85.337,262.933 85.200,261.647 85.200 C 260.430 85.200,260.048 85.027,259.884 84.400 C 259.710 83.735,259.338 83.600,257.684 83.600 C 256.030 83.600,255.658 83.465,255.484 82.800 C 255.307 82.123,254.938 82.000,253.084 82.000 C 251.230 82.000,250.861 81.877,250.684 81.200 C 250.506 80.520,250.138 80.400,248.237 80.400 C 246.599 80.400,246.000 80.252,246.000 79.847 C 246.000 79.129,244.753 78.812,241.900 78.805 C 240.203 78.801,239.600 78.654,239.600 78.243 C 239.600 77.458,238.697 77.200,235.953 77.200 C 234.369 77.200,233.218 76.968,232.515 76.507 C 231.736 75.997,230.374 75.775,227.341 75.663 C 224.471 75.556,223.084 75.342,222.763 74.955 C 222.391 74.507,220.233 74.400,211.551 74.400 L 200.800 74.400 200.800 37.200 L 200.800 0.000 198.600 0.000 C 197.390 0.000,196.400 0.180,196.400 0.400 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path1" d="M196.400 0.400 C 196.400 0.620,196.052 0.800,195.627 0.800 C 195.202 0.800,194.740 1.160,194.600 1.600 C 194.460 2.040,194.100 2.400,193.800 2.400 C 193.500 2.400,193.140 2.760,193.000 3.200 C 192.860 3.640,192.488 4.000,192.173 4.000 C 191.858 4.000,191.600 4.360,191.600 4.800 C 191.600 5.452,191.333 5.600,190.163 5.600 C 189.062 5.600,188.676 5.787,188.516 6.400 C 188.400 6.843,187.970 7.200,187.553 7.200 C 187.067 7.200,186.800 7.483,186.800 8.000 C 186.800 8.533,186.533 8.800,186.000 8.800 C 185.560 8.800,185.200 9.049,185.200 9.353 C 185.200 9.658,184.840 10.001,184.400 10.116 C 183.960 10.231,183.600 10.592,183.600 10.918 C 183.600 11.279,183.052 11.614,182.200 11.774 C 181.362 11.931,180.800 12.270,180.800 12.618 C 180.800 12.942,180.429 13.200,179.963 13.200 C 179.462 13.200,179.041 13.521,178.916 14.000 C 178.801 14.440,178.441 14.800,178.116 14.800 C 177.791 14.800,177.431 15.160,177.316 15.600 C 177.201 16.040,176.870 16.400,176.580 16.400 C 176.291 16.400,175.940 16.760,175.800 17.200 C 175.660 17.640,175.213 18.000,174.806 18.000 C 173.639 18.000,172.800 18.436,172.800 19.043 C 172.800 19.349,172.440 19.600,172.000 19.600 C 171.467 19.600,171.200 19.867,171.200 20.400 C 171.200 20.933,170.933 21.200,170.400 21.200 C 169.867 21.200,169.600 21.467,169.600 22.000 C 169.600 22.533,169.333 22.800,168.800 22.800 C 168.267 22.800,168.000 23.067,168.000 23.600 C 168.000 24.242,167.733 24.400,166.647 24.400 C 165.630 24.400,165.241 24.599,165.084 25.200 C 164.959 25.679,164.538 26.000,164.037 26.000 C 163.577 26.000,163.200 26.249,163.200 26.553 C 163.200 26.858,162.840 27.201,162.400 27.316 C 161.960 27.431,161.600 27.791,161.600 28.116 C 161.600 28.441,161.240 28.801,160.800 28.916 C 160.360 29.031,160.000 29.412,160.000 29.763 C 160.000 30.133,159.665 30.400,159.200 30.400 C 158.760 30.400,158.040 30.760,157.600 31.200 C 157.160 31.640,156.530 32.000,156.200 32.000 C 155.867 32.000,155.600 32.356,155.600 32.800 C 155.600 33.333,155.333 33.600,154.800 33.600 C 154.267 33.600,154.000 33.867,154.000 34.400 C 154.000 34.933,153.733 35.200,153.200 35.200 C 152.667 35.200,152.400 35.467,152.400 36.000 C 152.400 36.624,152.133 36.800,151.187 36.800 C 150.452 36.800,149.880 37.048,149.733 37.431 C 149.600 37.777,149.065 38.223,148.545 38.421 C 148.025 38.618,147.600 39.055,147.600 39.390 C 147.600 39.733,147.250 40.000,146.800 40.000 C 146.267 40.000,146.000 40.267,146.000 40.800 C 146.000 41.333,145.733 41.600,145.200 41.600 C 144.760 41.600,144.400 41.856,144.400 42.168 C 144.400 42.481,143.861 42.855,143.202 42.999 C 142.544 43.144,141.869 43.487,141.702 43.761 C 141.536 44.036,141.085 44.376,140.700 44.518 C 140.315 44.659,140.000 45.051,140.000 45.387 C 140.000 45.733,139.652 46.000,139.200 46.000 C 138.667 46.000,138.400 46.267,138.400 46.800 C 138.400 47.333,138.133 47.600,137.600 47.600 C 137.067 47.600,136.800 47.867,136.800 48.400 C 136.800 48.987,136.533 49.200,135.800 49.200 C 135.250 49.200,134.471 49.529,134.069 49.931 C 133.668 50.332,133.038 50.777,132.669 50.918 C 132.301 51.059,132.000 51.451,132.000 51.787 C 132.000 52.133,131.652 52.400,131.200 52.400 C 130.667 52.400,130.400 52.667,130.400 53.200 C 130.400 53.733,130.133 54.000,129.600 54.000 C 129.067 54.000,128.800 54.267,128.800 54.800 C 128.800 55.428,128.533 55.600,127.563 55.600 C 126.662 55.600,126.268 55.817,126.116 56.400 C 126.000 56.843,125.570 57.200,125.153 57.200 C 124.667 57.200,124.400 57.483,124.400 58.000 C 124.400 58.533,124.133 58.800,123.600 58.800 C 123.156 58.800,122.800 59.067,122.800 59.400 C 122.800 59.733,122.444 60.000,122.000 60.000 C 121.482 60.000,121.200 60.267,121.200 60.755 C 121.200 61.304,120.811 61.584,119.779 61.778 C 118.997 61.924,118.258 62.304,118.136 62.622 C 118.014 62.940,117.647 63.200,117.320 63.200 C 116.993 63.200,116.631 63.560,116.516 64.000 C 116.400 64.443,115.970 64.800,115.553 64.800 C 115.067 64.800,114.800 65.083,114.800 65.600 C 114.800 66.133,114.533 66.400,114.000 66.400 C 113.467 66.400,113.200 66.667,113.200 67.200 C 113.200 67.722,112.933 68.000,112.433 68.000 C 111.241 68.000,110.400 68.431,110.400 69.043 C 110.400 69.349,110.040 69.600,109.600 69.600 C 109.067 69.600,108.800 69.867,108.800 70.400 C 108.800 70.933,108.533 71.200,108.000 71.200 C 107.467 71.200,107.200 71.467,107.200 72.000 C 107.200 72.533,106.933 72.800,106.400 72.800 C 105.867 72.800,105.600 73.067,105.600 73.600 C 105.600 74.245,105.333 74.400,104.227 74.400 C 103.205 74.400,102.789 74.605,102.600 75.200 C 102.460 75.640,101.998 76.000,101.573 76.000 C 101.148 76.000,100.800 76.249,100.800 76.553 C 100.800 76.858,100.440 77.201,100.000 77.316 C 99.560 77.431,99.200 77.812,99.200 78.163 C 99.200 78.533,98.865 78.800,98.400 78.800 C 97.882 78.800,97.600 79.067,97.600 79.555 C 97.600 80.102,97.213 80.384,96.200 80.574 C 95.362 80.731,94.800 81.070,94.800 81.418 C 94.800 81.738,94.440 82.000,94.000 82.000 C 93.467 82.000,93.200 82.267,93.200 82.800 C 93.200 83.333,92.933 83.600,92.400 83.600 C 91.867 83.600,91.600 83.867,91.600 84.400 C 91.600 84.933,91.333 85.200,90.800 85.200 C 90.267 85.200,90.000 85.467,90.000 86.000 C 90.000 86.622,89.733 86.800,88.803 86.800 C 88.040 86.800,87.426 87.090,87.107 87.600 C 86.832 88.040,86.291 88.400,85.904 88.400 C 85.467 88.400,85.200 88.703,85.200 89.200 C 85.200 89.733,84.933 90.000,84.400 90.000 C 83.867 90.000,83.600 90.267,83.600 90.800 C 83.600 91.333,83.333 91.600,82.800 91.600 C 82.360 91.600,82.000 91.862,82.000 92.182 C 82.000 92.530,81.438 92.869,80.600 93.026 C 79.798 93.177,79.200 93.526,79.200 93.845 C 79.200 94.150,78.932 94.400,78.603 94.400 C 78.275 94.400,77.782 94.760,77.507 95.200 C 77.232 95.640,76.781 96.000,76.504 96.000 C 76.227 96.000,76.000 96.287,76.000 96.637 C 76.000 96.988,75.640 97.369,75.200 97.484 C 74.003 97.797,74.003 102.203,75.200 102.516 C 75.640 102.631,76.000 103.012,76.000 103.363 C 76.000 103.713,76.230 104.000,76.511 104.000 C 76.792 104.000,77.326 104.315,77.697 104.700 C 79.244 106.305,79.862 106.750,80.903 107.011 C 81.506 107.163,82.000 107.537,82.000 107.843 C 82.000 108.150,82.360 108.400,82.800 108.400 C 83.333 108.400,83.600 108.667,83.600 109.200 C 83.600 109.733,83.867 110.000,84.400 110.000 C 84.933 110.000,85.200 110.267,85.200 110.800 C 85.200 111.297,85.467 111.600,85.904 111.600 C 86.291 111.600,86.832 111.960,87.107 112.400 C 87.426 112.910,88.040 113.200,88.803 113.200 C 89.733 113.200,90.000 113.378,90.000 114.000 C 90.000 114.533,90.267 114.800,90.800 114.800 C 91.333 114.800,91.600 115.067,91.600 115.600 C 91.600 116.133,91.867 116.400,92.400 116.400 C 92.933 116.400,93.200 116.667,93.200 117.200 C 93.200 117.733,93.467 118.000,94.000 118.000 C 94.440 118.000,94.800 118.262,94.800 118.582 C 94.800 118.930,95.362 119.269,96.200 119.426 C 97.213 119.616,97.600 119.898,97.600 120.445 C 97.600 120.918,97.881 121.200,98.353 121.200 C 98.770 121.200,99.200 121.557,99.316 122.000 C 99.431 122.440,99.812 122.800,100.163 122.800 C 100.513 122.800,100.800 123.070,100.800 123.400 C 100.800 123.730,101.154 124.000,101.586 124.000 C 102.018 124.000,102.565 124.360,102.800 124.800 C 103.080 125.324,103.638 125.600,104.414 125.600 C 105.333 125.600,105.600 125.780,105.600 126.400 C 105.600 126.933,105.867 127.200,106.400 127.200 C 106.933 127.200,107.200 127.467,107.200 128.000 C 107.200 128.533,107.467 128.800,108.000 128.800 C 108.533 128.800,108.800 129.067,108.800 129.600 C 108.800 130.133,109.067 130.400,109.600 130.400 C 110.040 130.400,110.400 130.651,110.400 130.957 C 110.400 131.569,111.241 132.000,112.433 132.000 C 112.933 132.000,113.200 132.278,113.200 132.800 C 113.200 133.333,113.467 133.600,114.000 133.600 C 114.533 133.600,114.800 133.867,114.800 134.400 C 114.800 134.917,115.067 135.200,115.553 135.200 C 115.970 135.200,116.400 135.557,116.516 136.000 C 116.631 136.440,116.993 136.800,117.320 136.800 C 117.647 136.800,118.014 137.060,118.136 137.378 C 118.258 137.696,118.997 138.076,119.779 138.222 C 120.811 138.416,121.200 138.696,121.200 139.245 C 121.200 139.733,121.482 140.000,122.000 140.000 C 122.444 140.000,122.800 140.267,122.800 140.600 C 122.800 140.933,123.156 141.200,123.600 141.200 C 124.133 141.200,124.400 141.467,124.400 142.000 C 124.400 142.533,124.667 142.800,125.200 142.800 C 125.640 142.800,126.000 143.051,126.000 143.357 C 126.000 143.969,126.841 144.400,128.033 144.400 C 128.533 144.400,128.800 144.678,128.800 145.200 C 128.800 145.733,129.067 146.000,129.600 146.000 C 130.133 146.000,130.400 146.267,130.400 146.800 C 130.400 147.317,130.667 147.600,131.153 147.600 C 131.570 147.600,132.000 147.957,132.116 148.400 C 132.241 148.879,132.662 149.200,133.163 149.200 C 133.629 149.200,134.000 149.458,134.000 149.782 C 134.000 150.130,134.562 150.469,135.400 150.626 C 136.413 150.816,136.800 151.098,136.800 151.645 C 136.800 152.133,137.082 152.400,137.600 152.400 C 138.133 152.400,138.400 152.667,138.400 153.200 C 138.400 153.733,138.667 154.000,139.200 154.000 C 139.652 154.000,140.000 154.267,140.000 154.613 C 140.000 154.949,140.315 155.341,140.700 155.482 C 141.085 155.624,141.536 155.964,141.702 156.239 C 141.869 156.513,142.544 156.856,143.202 157.001 C 143.861 157.145,144.400 157.519,144.400 157.832 C 144.400 158.144,144.760 158.400,145.200 158.400 C 145.733 158.400,146.000 158.667,146.000 159.200 C 146.000 159.733,146.267 160.000,146.800 160.000 C 147.250 160.000,147.600 160.267,147.600 160.610 C 147.600 160.945,148.025 161.382,148.545 161.579 C 149.065 161.777,149.600 162.223,149.733 162.569 C 149.880 162.952,150.452 163.200,151.187 163.200 C 152.133 163.200,152.400 163.376,152.400 164.000 C 152.400 164.533,152.667 164.800,153.200 164.800 C 153.733 164.800,154.000 165.067,154.000 165.600 C 154.000 166.133,154.267 166.400,154.800 166.400 C 155.333 166.400,155.600 166.667,155.600 167.200 C 155.600 167.718,155.867 168.000,156.357 168.000 C 156.774 168.000,157.212 168.253,157.330 168.562 C 157.449 168.872,158.098 169.246,158.773 169.394 C 159.483 169.550,160.000 169.919,160.000 170.269 C 160.000 170.602,160.360 170.969,160.800 171.084 C 161.240 171.199,161.600 171.559,161.600 171.884 C 161.600 172.209,161.960 172.569,162.400 172.684 C 162.840 172.799,163.200 173.057,163.200 173.257 C 163.200 173.456,163.650 173.791,164.200 174.000 C 164.750 174.209,165.200 174.655,165.200 174.990 C 165.200 175.420,165.612 175.600,166.600 175.600 C 167.733 175.600,168.000 175.752,168.000 176.400 C 168.000 176.933,168.267 177.200,168.800 177.200 C 169.333 177.200,169.600 177.467,169.600 178.000 C 169.600 178.533,169.867 178.800,170.400 178.800 C 170.933 178.800,171.200 179.067,171.200 179.600 C 171.200 180.044,171.467 180.400,171.800 180.400 C 172.130 180.400,172.760 180.760,173.200 181.200 C 173.640 181.640,174.348 182.000,174.773 182.000 C 175.198 182.000,175.660 182.360,175.800 182.800 C 175.940 183.240,176.312 183.600,176.627 183.600 C 176.942 183.600,177.200 183.876,177.200 184.213 C 177.200 184.549,177.515 184.943,177.900 185.086 C 178.285 185.230,178.835 185.674,179.123 186.074 C 179.410 186.473,179.815 186.800,180.023 186.800 C 180.230 186.800,180.760 187.160,181.200 187.600 C 181.640 188.040,182.360 188.400,182.800 188.400 C 183.265 188.400,183.600 188.667,183.600 189.037 C 183.600 189.388,183.960 189.769,184.400 189.884 C 184.840 189.999,185.200 190.342,185.200 190.647 C 185.200 190.951,185.560 191.200,186.000 191.200 C 186.533 191.200,186.800 191.467,186.800 192.000 C 186.800 192.497,187.067 192.800,187.504 192.800 C 187.891 192.800,188.432 193.160,188.707 193.600 C 189.026 194.110,189.640 194.400,190.403 194.400 C 191.333 194.400,191.600 194.578,191.600 195.200 C 191.600 195.640,191.858 196.000,192.173 196.000 C 192.488 196.000,192.860 196.360,193.000 196.800 C 193.140 197.240,193.500 197.600,193.800 197.600 C 194.100 197.600,194.460 197.960,194.600 198.400 C 194.740 198.840,195.202 199.200,195.627 199.200 C 196.052 199.200,196.400 199.451,196.400 199.757 C 196.400 200.477,197.278 200.800,199.233 200.800 L 200.800 200.800 200.800 163.900 L 200.799 127.000 209.400 127.115 C 217.639 127.225,218.000 127.263,218.000 128.015 C 218.000 128.743,218.292 128.800,222.000 128.800 C 225.733 128.800,226.000 128.853,226.000 129.600 C 226.000 130.302,226.267 130.400,228.186 130.400 C 229.962 130.400,230.452 130.550,230.800 131.200 C 231.135 131.827,231.638 132.000,233.118 132.000 C 234.574 132.000,235.122 132.183,235.507 132.800 C 235.898 133.426,236.440 133.600,238.003 133.600 C 239.733 133.600,240.000 133.707,240.000 134.400 C 240.000 135.067,240.267 135.200,241.600 135.200 C 242.667 135.200,243.467 135.467,244.000 136.000 C 244.485 136.485,245.333 136.800,246.153 136.800 C 247.170 136.800,247.559 136.999,247.716 137.600 C 247.875 138.206,248.262 138.400,249.316 138.400 C 250.370 138.400,250.757 138.594,250.916 139.200 C 251.031 139.640,251.457 140.006,251.863 140.013 C 252.268 140.020,252.949 140.290,253.376 140.613 C 253.804 140.936,254.479 141.200,254.876 141.200 C 255.333 141.200,255.600 141.495,255.600 142.000 C 255.600 142.667,255.867 142.800,257.200 142.800 C 258.533 142.800,258.800 142.933,258.800 143.600 C 258.800 144.117,259.067 144.400,259.553 144.400 C 259.970 144.400,260.400 144.757,260.516 145.200 C 260.668 145.783,261.062 146.000,261.963 146.000 C 262.933 146.000,263.200 146.172,263.200 146.800 C 263.200 147.317,263.467 147.600,263.953 147.600 C 264.370 147.600,264.800 147.957,264.916 148.400 C 265.076 149.013,265.462 149.200,266.563 149.200 C 267.733 149.200,268.000 149.348,268.000 150.000 C 268.000 150.533,268.267 150.800,268.800 150.800 C 269.333 150.800,269.600 151.067,269.600 151.600 C 269.600 152.133,269.867 152.400,270.400 152.400 C 270.865 152.400,271.200 152.667,271.200 153.037 C 271.200 153.388,271.560 153.769,272.000 153.884 C 272.440 153.999,272.800 154.330,272.800 154.620 C 272.800 154.909,273.160 155.260,273.600 155.400 C 274.040 155.540,274.400 155.912,274.400 156.227 C 274.400 156.542,274.760 156.800,275.200 156.800 C 275.665 156.800,276.000 157.067,276.000 157.437 C 276.000 157.788,276.360 158.169,276.800 158.284 C 277.240 158.399,277.600 158.736,277.600 159.033 C 277.600 159.329,277.960 159.765,278.400 160.000 C 278.840 160.235,279.200 160.692,279.200 161.014 C 279.200 161.336,279.458 161.600,279.773 161.600 C 280.088 161.600,280.460 161.960,280.600 162.400 C 280.740 162.840,281.112 163.200,281.427 163.200 C 281.742 163.200,282.000 163.487,282.000 163.837 C 282.000 164.188,282.360 164.569,282.800 164.684 C 283.243 164.800,283.600 165.230,283.600 165.647 C 283.600 166.133,283.883 166.400,284.400 166.400 C 284.933 166.400,285.200 166.667,285.200 167.200 C 285.200 167.733,285.467 168.000,286.000 168.000 C 286.497 168.000,286.800 168.267,286.800 168.704 C 286.800 169.091,287.160 169.632,287.600 169.907 C 288.040 170.182,288.400 170.834,288.400 171.357 C 288.400 171.970,288.683 172.381,289.200 172.516 C 289.640 172.631,290.000 173.000,290.000 173.336 C 290.000 173.671,290.360 174.060,290.800 174.200 C 291.240 174.340,291.600 174.789,291.600 175.199 C 291.600 176.135,293.247 178.760,293.849 178.783 C 294.096 178.792,294.413 179.520,294.554 180.400 C 294.719 181.435,295.020 182.000,295.405 182.000 C 295.733 182.000,296.000 182.358,296.000 182.800 C 296.000 183.240,296.360 183.960,296.800 184.400 C 297.240 184.840,297.600 185.560,297.600 186.000 C 297.600 186.533,297.867 186.800,298.400 186.800 C 299.052 186.800,299.200 187.067,299.200 188.237 C 299.200 189.308,299.392 189.725,299.952 189.872 C 300.506 190.016,300.758 190.549,300.909 191.894 C 301.032 192.985,301.374 193.866,301.758 194.080 C 302.178 194.316,302.400 194.985,302.400 196.020 C 302.400 197.333,302.535 197.600,303.200 197.600 C 303.893 197.600,304.000 197.867,304.000 199.586 C 304.000 201.162,304.165 201.660,304.800 202.000 C 305.438 202.342,305.600 202.838,305.600 204.452 C 305.600 206.138,305.733 206.510,306.400 206.684 C 307.084 206.863,307.200 207.230,307.200 209.213 C 307.200 210.538,307.388 211.596,307.638 211.679 C 308.190 211.863,308.760 214.760,308.783 217.500 C 308.795 218.991,308.957 219.600,309.342 219.600 C 309.775 219.600,309.926 221.386,310.096 228.500 C 310.395 241.007,310.020 255.600,309.400 255.600 C 309.081 255.600,308.836 256.776,308.672 259.096 C 308.499 261.553,308.243 262.725,307.813 263.040 C 307.390 263.349,307.200 264.175,307.200 265.697 C 307.200 267.570,307.078 267.939,306.400 268.116 C 305.723 268.293,305.600 268.662,305.600 270.516 C 305.600 272.370,305.477 272.739,304.800 272.916 C 304.134 273.090,304.000 273.462,304.000 275.136 C 304.000 276.795,303.860 277.190,303.200 277.400 C 302.579 277.597,302.400 278.005,302.400 279.227 C 302.400 280.300,302.224 280.800,301.847 280.800 C 301.216 280.800,300.813 282.000,300.805 283.900 C 300.801 284.932,300.635 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.935 288.400,297.600 288.667,297.600 289.037 C 297.600 289.387,297.240 290.131,296.800 290.691 C 296.360 291.250,296.000 292.044,296.000 292.454 C 296.000 292.864,295.749 293.200,295.443 293.200 C 294.831 293.200,294.400 294.041,294.400 295.233 C 294.400 295.655,294.133 296.000,293.808 296.000 C 293.482 296.000,293.102 296.450,292.964 297.000 C 292.826 297.550,292.463 298.000,292.157 298.000 C 291.787 298.000,291.600 298.471,291.600 299.400 C 291.600 300.533,291.448 300.800,290.800 300.800 C 290.267 300.800,290.000 301.067,290.000 301.600 C 290.000 302.133,289.733 302.400,289.200 302.400 C 288.578 302.400,288.400 302.667,288.400 303.597 C 288.400 304.360,288.110 304.974,287.600 305.293 C 287.160 305.568,286.800 306.109,286.800 306.496 C 286.800 306.933,286.497 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.935 308.800,283.600 309.067,283.600 309.437 C 283.600 309.788,283.240 310.169,282.800 310.284 C 282.360 310.399,282.000 310.676,282.000 310.899 C 282.000 311.123,281.370 311.900,280.600 312.626 C 279.830 313.352,279.200 314.126,279.200 314.346 C 279.200 314.566,278.840 314.860,278.400 315.000 C 277.960 315.140,277.600 315.491,277.600 315.780 C 277.600 316.070,277.240 316.401,276.800 316.516 C 276.360 316.631,276.000 316.991,276.000 317.316 C 276.000 317.641,275.640 318.001,275.200 318.116 C 274.760 318.231,274.400 318.612,274.400 318.963 C 274.400 319.333,274.065 319.600,273.600 319.600 C 273.067 319.600,272.800 319.867,272.800 320.400 C 272.800 320.933,272.533 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.118,269.333 324.400,268.843 324.400 C 268.426 324.400,267.988 324.653,267.870 324.962 C 267.751 325.272,267.103 325.646,266.429 325.794 C 265.756 325.941,265.069 326.287,264.902 326.561 C 264.736 326.836,264.285 327.176,263.900 327.318 C 263.515 327.459,263.200 327.831,263.200 328.143 C 263.200 328.475,262.619 328.820,261.800 328.974 C 260.962 329.131,260.400 329.470,260.400 329.818 C 260.400 330.138,260.040 330.400,259.600 330.400 C 259.067 330.400,258.800 330.667,258.800 331.200 C 258.800 331.852,258.533 332.000,257.363 332.000 C 256.262 332.000,255.876 332.187,255.716 332.800 C 255.600 333.243,255.170 333.600,254.753 333.600 C 254.339 333.600,253.640 333.960,253.200 334.400 C 252.760 334.840,252.083 335.200,251.696 335.200 C 251.309 335.200,250.768 335.560,250.493 336.000 C 250.174 336.510,249.560 336.800,248.797 336.800 C 247.867 336.800,247.600 336.978,247.600 337.600 C 247.600 338.261,247.333 338.400,246.062 338.400 C 245.032 338.400,244.285 338.664,243.800 339.200 C 243.315 339.736,242.568 340.000,241.538 340.000 C 240.267 340.000,240.000 340.139,240.000 340.800 C 240.000 341.502,239.733 341.600,237.820 341.600 C 236.415 341.600,235.526 341.792,235.320 342.140 C 235.144 342.436,234.106 342.798,233.014 342.944 C 231.903 343.092,230.880 343.471,230.694 343.804 C 230.465 344.213,229.706 344.400,228.276 344.400 C 226.626 344.400,226.089 344.566,225.693 345.200 C 225.256 345.899,224.760 346.000,221.759 346.000 C 218.662 346.000,218.305 346.078,218.116 346.800 C 217.916 347.566,217.570 347.600,209.986 347.600 C 201.767 347.600,200.800 347.710,200.800 348.643 C 200.800 348.949,200.440 349.200,200.000 349.200 C 199.560 349.200,199.200 348.949,199.200 348.643 C 199.200 347.710,198.233 347.600,190.014 347.600 C 182.430 347.600,182.084 347.566,181.884 346.800 C 181.695 346.078,181.338 346.000,178.241 346.000 C 175.240 346.000,174.744 345.899,174.307 345.200 C 173.911 344.566,173.374 344.400,171.724 344.400 C 170.294 344.400,169.535 344.213,169.306 343.804 C 169.120 343.471,168.097 343.092,166.986 342.944 C 165.894 342.798,164.856 342.436,164.680 342.140 C 164.474 341.792,163.585 341.600,162.180 341.600 C 160.267 341.600,160.000 341.502,160.000 340.800 C 160.000 340.137,159.733 340.000,158.447 340.000 C 157.230 340.000,156.848 339.827,156.684 339.200 C 156.509 338.532,156.138 338.400,154.437 338.400 C 152.667 338.400,152.400 338.295,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.467,148.933 335.200,148.400 335.200 C 147.960 335.200,147.240 334.840,146.800 334.400 C 146.360 333.960,145.661 333.600,145.247 333.600 C 144.830 333.600,144.400 333.243,144.284 332.800 C 144.124 332.187,143.738 332.000,142.637 332.000 C 141.467 332.000,141.200 331.852,141.200 331.200 C 141.200 330.756,140.933 330.400,140.600 330.400 C 140.270 330.400,139.640 330.040,139.200 329.600 C 138.760 329.160,138.040 328.800,137.600 328.800 C 137.135 328.800,136.800 328.533,136.800 328.163 C 136.800 327.812,136.440 327.431,136.000 327.316 C 135.560 327.201,135.200 326.942,135.200 326.741 C 135.200 326.540,134.885 326.260,134.500 326.119 C 134.115 325.979,133.371 325.534,132.846 325.132 C 132.321 324.729,131.556 324.400,131.146 324.400 C 130.667 324.400,130.400 324.114,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.867 319.600,125.600 319.333,125.600 318.800 C 125.600 318.267,125.333 318.000,124.800 318.000 C 124.335 318.000,124.000 317.733,124.000 317.363 C 124.000 317.012,123.640 316.631,123.200 316.516 C 122.760 316.401,122.400 316.058,122.400 315.753 C 122.400 315.449,122.124 315.200,121.787 315.200 C 121.451 315.200,121.055 314.885,120.908 314.500 C 120.761 314.115,120.046 313.239,119.320 312.553 C 118.594 311.867,118.000 311.123,118.000 310.899 C 118.000 310.676,117.640 310.399,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.503 307.200,113.200 306.933,113.200 306.496 C 113.200 306.109,112.840 305.568,112.400 305.293 C 111.935 305.003,111.600 304.360,111.600 303.759 C 111.600 303.062,111.340 302.657,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.552 300.800,108.400 300.533,108.400 299.400 C 108.400 298.471,108.213 298.000,107.843 298.000 C 107.537 298.000,107.174 297.550,107.036 297.000 C 106.898 296.450,106.518 296.000,106.192 296.000 C 105.867 296.000,105.600 295.655,105.600 295.233 C 105.600 294.041,105.169 293.200,104.557 293.200 C 104.251 293.200,104.000 292.864,104.000 292.454 C 104.000 292.044,103.640 291.250,103.200 290.691 C 102.760 290.131,102.400 289.431,102.400 289.133 C 102.400 288.836,102.040 288.368,101.600 288.093 C 101.090 287.774,100.800 287.160,100.800 286.397 C 100.800 285.467,100.622 285.200,100.000 285.200 C 99.365 285.200,99.199 284.932,99.195 283.900 C 99.187 282.000,98.784 280.800,98.153 280.800 C 97.776 280.800,97.600 280.300,97.600 279.227 C 97.600 278.005,97.421 277.597,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.527 272.740,94.400 272.370,94.400 270.580 C 94.400 268.805,94.268 268.412,93.600 268.200 C 92.926 267.986,92.800 267.595,92.800 265.717 C 92.800 264.177,92.611 263.350,92.187 263.040 C 91.757 262.725,91.501 261.553,91.328 259.096 C 91.164 256.771,90.920 255.600,90.599 255.600 C 90.243 255.600,90.061 253.269,89.905 246.729 C 89.716 238.778,89.619 237.803,88.970 237.329 C 88.388 236.903,83.221 236.800,62.524 236.800 L 36.800 236.800 36.800 248.304 C 36.800 259.374,36.830 259.826,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.528 277.200,41.600 277.467,41.600 280.180 C 41.600 282.268,41.763 283.256,42.143 283.480 C 42.442 283.656,42.784 284.689,42.903 285.776 C 43.028 286.917,43.389 287.949,43.759 288.220 C 44.191 288.535,44.400 289.307,44.400 290.582 C 44.400 292.138,44.542 292.512,45.200 292.684 C 45.813 292.845,46.001 293.232,46.005 294.347 C 46.013 296.391,46.400 297.600,47.047 297.600 C 47.426 297.600,47.600 298.104,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.067 300.800,49.200 301.067,49.200 302.400 C 49.200 303.467,49.467 304.267,50.000 304.800 C 50.455 305.255,50.800 306.133,50.800 306.837 C 50.800 307.738,51.017 308.132,51.600 308.284 C 52.206 308.443,52.400 308.830,52.400 309.884 C 52.400 310.938,52.594 311.325,53.200 311.484 C 53.806 311.643,54.000 312.030,54.000 313.084 C 54.000 314.138,54.194 314.525,54.800 314.684 C 55.364 314.832,55.600 315.230,55.600 316.033 C 55.600 316.762,55.887 317.326,56.400 317.600 C 56.840 317.835,57.200 318.361,57.200 318.767 C 57.200 319.174,57.560 319.601,58.000 319.716 C 58.585 319.869,58.800 320.262,58.800 321.175 C 58.800 321.907,59.044 322.519,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 62.979 327.200,63.200 327.467,63.200 328.167 C 63.200 329.548,63.598 330.400,64.243 330.400 C 64.549 330.400,64.800 330.760,64.800 331.200 C 64.800 331.718,65.067 332.000,65.555 332.000 C 66.102 332.000,66.384 332.387,66.574 333.400 C 66.731 334.238,67.070 334.800,67.418 334.800 C 67.742 334.800,68.000 335.171,68.000 335.637 C 68.000 336.138,68.321 336.559,68.800 336.684 C 69.243 336.800,69.600 337.230,69.600 337.647 C 69.600 338.133,69.883 338.400,70.400 338.400 C 70.924 338.400,71.200 338.667,71.200 339.173 C 71.200 339.598,71.560 340.060,72.000 340.200 C 72.560 340.378,72.800 340.805,72.800 341.627 C 72.800 342.533,72.982 342.800,73.600 342.800 C 74.117 342.800,74.400 343.067,74.400 343.553 C 74.400 343.970,74.757 344.400,75.200 344.516 C 75.640 344.631,76.000 345.012,76.000 345.363 C 76.000 345.713,76.270 346.000,76.600 346.000 C 76.930 346.000,77.200 346.287,77.200 346.637 C 77.200 346.988,77.560 347.369,78.000 347.484 C 78.443 347.600,78.800 348.030,78.800 348.447 C 78.800 348.933,79.083 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.333 360.000,91.600 360.267,91.600 360.800 C 91.600 361.333,91.867 361.600,92.400 361.600 C 92.917 361.600,93.200 361.867,93.200 362.353 C 93.200 362.770,93.557 363.200,94.000 363.316 C 94.440 363.431,94.800 363.812,94.800 364.163 C 94.800 364.575,95.151 364.800,95.797 364.800 C 96.360 364.800,97.010 365.148,97.293 365.600 C 97.568 366.040,98.109 366.400,98.496 366.400 C 98.933 366.400,99.200 366.703,99.200 367.200 C 99.200 367.733,99.467 368.000,100.000 368.000 C 100.450 368.000,100.800 368.267,100.800 368.610 C 100.800 368.945,101.250 369.391,101.800 369.600 C 102.350 369.809,102.800 370.156,102.800 370.372 C 102.800 370.587,103.430 370.882,104.200 371.026 C 105.052 371.186,105.600 371.521,105.600 371.882 C 105.600 372.208,105.960 372.569,106.400 372.684 C 106.840 372.799,107.200 373.122,107.200 373.402 C 107.200 373.682,107.813 374.026,108.561 374.166 C 109.310 374.307,110.024 374.687,110.149 375.011 C 110.273 375.335,110.741 375.600,111.187 375.600 C 111.733 375.600,112.000 375.863,112.000 376.400 C 112.000 377.048,112.267 377.200,113.400 377.200 C 114.533 377.200,114.800 377.352,114.800 378.000 C 114.800 378.667,115.067 378.800,116.400 378.800 C 117.733 378.800,118.000 378.933,118.000 379.600 C 118.000 380.097,118.267 380.400,118.704 380.400 C 119.091 380.400,119.632 380.760,119.907 381.200 C 120.219 381.699,120.840 382.000,121.557 382.000 C 122.370 382.000,122.768 382.234,122.916 382.800 C 123.075 383.406,123.462 383.600,124.516 383.600 C 125.570 383.600,125.957 383.794,126.116 384.400 C 126.276 385.013,126.662 385.200,127.763 385.200 C 128.754 385.200,129.200 385.381,129.200 385.782 C 129.200 386.134,129.774 386.471,130.655 386.637 C 131.455 386.787,132.445 387.245,132.855 387.655 C 133.333 388.133,134.173 388.400,135.200 388.400 C 136.301 388.400,136.800 388.574,136.800 388.957 C 136.800 389.602,137.652 390.000,139.033 390.000 C 139.626 390.000,140.000 390.232,140.000 390.600 C 140.000 391.044,140.467 391.200,141.800 391.200 C 143.067 391.200,143.837 391.437,144.400 392.000 C 144.987 392.587,145.733 392.800,147.200 392.800 C 148.933 392.800,149.200 392.907,149.200 393.600 C 149.200 394.309,149.467 394.400,151.553 394.400 C 153.570 394.400,153.937 394.514,154.116 395.200 C 154.302 395.911,154.662 396.000,157.363 396.000 C 160.133 396.000,160.400 396.070,160.400 396.800 C 160.400 397.537,160.667 397.600,163.797 397.600 C 166.760 397.600,167.257 397.702,167.693 398.400 C 168.144 399.123,168.626 399.200,172.696 399.200 C 175.432 399.200,177.200 399.357,177.200 399.600 C 177.200 399.862,185.067 400.000,200.000 400.000 C 214.933 400.000,222.800 399.862,222.800 399.600 C 222.800 399.357,224.568 399.200,227.304 399.200 C 231.374 399.200,231.856 399.123,232.307 398.400 C 232.743 397.702,233.240 397.600,236.203 397.600 C 239.333 397.600,239.600 397.537,239.600 396.800 C 239.600 396.070,239.867 396.000,242.637 396.000 C 245.338 396.000,245.698 395.911,245.884 395.200 C 246.063 394.514,246.430 394.400,248.447 394.400 C 250.533 394.400,250.800 394.309,250.800 393.600 C 250.800 392.901,251.067 392.800,252.911 392.800 C 254.527 392.800,255.183 392.612,255.707 392.000 C 256.204 391.420,256.887 391.200,258.196 391.200 C 259.533 391.200,260.000 391.045,260.000 390.600 C 260.000 390.178,260.426 390.000,261.437 390.000 C 262.538 390.000,262.924 389.813,263.084 389.200 C 263.248 388.573,263.630 388.400,264.847 388.400 C 265.867 388.400,266.675 388.125,267.200 387.600 C 267.640 387.160,268.452 386.800,269.004 386.800 C 269.556 386.800,270.316 386.440,270.693 386.000 C 271.083 385.545,271.873 385.200,272.526 385.200 C 273.338 385.200,273.736 384.966,273.884 384.400 C 274.043 383.794,274.430 383.600,275.484 383.600 C 276.538 383.600,276.925 383.406,277.084 382.800 C 277.232 382.234,277.630 382.000,278.443 382.000 C 279.160 382.000,279.781 381.699,280.093 381.200 C 280.368 380.760,280.909 380.400,281.296 380.400 C 281.733 380.400,282.000 380.097,282.000 379.600 C 282.000 378.933,282.267 378.800,283.600 378.800 C 284.933 378.800,285.200 378.667,285.200 378.000 C 285.200 377.352,285.467 377.200,286.600 377.200 C 287.733 377.200,288.000 377.048,288.000 376.400 C 288.000 375.863,288.267 375.600,288.813 375.600 C 289.259 375.600,289.727 375.335,289.851 375.011 C 289.976 374.687,290.690 374.307,291.439 374.166 C 292.187 374.026,292.800 373.682,292.800 373.402 C 292.800 373.122,293.160 372.799,293.600 372.684 C 294.040 372.569,294.400 372.208,294.400 371.882 C 294.400 371.521,294.948 371.186,295.800 371.026 C 296.570 370.882,297.200 370.587,297.200 370.372 C 297.200 370.156,297.650 369.809,298.200 369.600 C 298.750 369.391,299.200 368.945,299.200 368.610 C 299.200 368.267,299.550 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.689,301.067 366.400,301.538 366.400 C 301.944 366.400,302.602 366.040,303.000 365.600 C 303.398 365.160,304.056 364.800,304.462 364.800 C 304.871 364.800,305.200 364.515,305.200 364.163 C 305.200 363.812,305.560 363.431,306.000 363.316 C 306.440 363.201,306.800 362.841,306.800 362.516 C 306.800 362.191,307.160 361.831,307.600 361.716 C 308.043 361.600,308.400 361.170,308.400 360.753 C 308.400 360.267,308.683 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.151,311.600 357.847 C 311.600 357.542,311.960 357.199,312.400 357.084 C 312.840 356.969,313.200 356.588,313.200 356.237 C 313.200 355.867,313.535 355.600,314.000 355.600 C 314.533 355.600,314.800 355.333,314.800 354.800 C 314.800 354.267,315.067 354.000,315.600 354.000 C 316.133 354.000,316.400 353.733,316.400 353.200 C 316.400 352.667,316.667 352.400,317.200 352.400 C 317.733 352.400,318.000 352.133,318.000 351.600 C 318.000 351.067,318.267 350.800,318.800 350.800 C 319.333 350.800,319.600 350.533,319.600 350.000 C 319.600 349.467,319.867 349.200,320.400 349.200 C 320.917 349.200,321.200 348.933,321.200 348.447 C 321.200 348.030,321.557 347.600,322.000 347.484 C 322.440 347.369,322.800 346.988,322.800 346.637 C 322.800 346.287,323.070 346.000,323.400 346.000 C 323.730 346.000,324.000 345.713,324.000 345.363 C 324.000 345.012,324.360 344.631,324.800 344.516 C 325.243 344.400,325.600 343.970,325.600 343.553 C 325.600 343.067,325.883 342.800,326.400 342.800 C 327.018 342.800,327.200 342.533,327.200 341.627 C 327.200 340.805,327.440 340.378,328.000 340.200 C 328.440 340.060,328.800 339.598,328.800 339.173 C 328.800 338.667,329.076 338.400,329.600 338.400 C 330.117 338.400,330.400 338.133,330.400 337.647 C 330.400 337.230,330.757 336.800,331.200 336.684 C 331.679 336.559,332.000 336.138,332.000 335.637 C 332.000 335.171,332.258 334.800,332.582 334.800 C 332.930 334.800,333.269 334.238,333.426 333.400 C 333.616 332.387,333.898 332.000,334.445 332.000 C 334.933 332.000,335.200 331.718,335.200 331.200 C 335.200 330.760,335.451 330.400,335.757 330.400 C 336.402 330.400,336.800 329.548,336.800 328.167 C 336.800 327.467,337.021 327.200,337.600 327.200 C 338.133 327.200,338.400 326.933,338.400 326.400 C 338.400 325.960,338.650 325.600,338.955 325.600 C 339.271 325.600,339.621 325.011,339.766 324.239 C 339.907 323.490,340.287 322.776,340.611 322.651 C 340.956 322.519,341.200 321.907,341.200 321.175 C 341.200 320.262,341.415 319.869,342.000 319.716 C 342.440 319.601,342.800 319.174,342.800 318.767 C 342.800 318.361,343.160 317.835,343.600 317.600 C 344.113 317.326,344.400 316.762,344.400 316.033 C 344.400 315.230,344.636 314.832,345.200 314.684 C 345.806 314.525,346.000 314.138,346.000 313.084 C 346.000 312.030,346.194 311.643,346.800 311.484 C 347.406 311.325,347.600 310.938,347.600 309.884 C 347.600 308.830,347.794 308.443,348.400 308.284 C 348.983 308.132,349.200 307.738,349.200 306.837 C 349.200 306.133,349.545 305.255,350.000 304.800 C 350.533 304.267,350.800 303.467,350.800 302.400 C 350.800 301.067,350.933 300.800,351.600 300.800 C 352.248 300.800,352.400 300.533,352.400 299.400 C 352.400 298.533,352.705 297.695,353.200 297.200 C 353.757 296.643,354.000 295.867,354.000 294.647 C 354.000 293.230,354.153 292.853,354.800 292.684 C 355.458 292.512,355.600 292.138,355.600 290.582 C 355.600 289.307,355.809 288.535,356.241 288.220 C 356.611 287.949,356.972 286.917,357.097 285.776 C 357.216 284.689,357.558 283.656,357.857 283.480 C 358.237 283.256,358.400 282.268,358.400 280.180 C 358.400 277.467,358.472 277.200,359.200 277.200 C 359.937 277.200,360.000 276.933,360.000 273.803 C 360.000 270.840,360.102 270.343,360.800 269.907 C 361.519 269.458,361.600 268.974,361.600 265.107 C 361.600 261.240,361.681 260.756,362.400 260.307 C 363.185 259.817,363.200 259.374,363.200 237.400 C 363.200 215.426,363.185 214.983,362.400 214.493 C 361.685 214.046,361.600 213.560,361.600 209.893 C 361.600 206.226,361.515 205.740,360.800 205.293 C 360.101 204.856,360.000 204.360,360.000 201.359 C 360.000 198.262,359.922 197.905,359.200 197.716 C 358.491 197.531,358.400 197.170,358.400 194.553 C 358.400 192.195,358.279 191.600,357.800 191.600 C 357.374 191.600,357.198 191.164,357.195 190.100 C 357.187 188.011,356.805 186.800,356.153 186.800 C 355.766 186.800,355.600 186.271,355.600 185.033 C 355.600 182.886,355.296 182.000,354.557 182.000 C 354.196 182.000,353.998 181.542,353.995 180.700 C 353.987 178.800,353.584 177.600,352.953 177.600 C 352.574 177.600,352.400 177.096,352.400 176.000 C 352.400 174.703,352.258 174.400,351.651 174.400 C 351.042 174.400,350.865 174.017,350.704 172.346 C 350.577 171.017,350.276 170.162,349.854 169.926 C 349.441 169.695,349.200 169.038,349.200 168.143 C 349.200 167.062,349.010 166.675,348.400 166.516 C 347.803 166.360,347.600 165.970,347.600 164.980 C 347.600 164.005,347.388 163.587,346.800 163.400 C 346.205 163.211,346.000 162.795,346.000 161.773 C 346.000 160.667,345.845 160.400,345.200 160.400 C 344.548 160.400,344.400 160.133,344.400 158.963 C 344.400 157.862,344.213 157.476,343.600 157.316 C 343.157 157.200,342.800 156.770,342.800 156.353 C 342.800 155.939,342.549 155.600,342.243 155.600 C 341.598 155.600,341.200 154.748,341.200 153.367 C 341.200 152.809,340.965 152.400,340.645 152.400 C 340.327 152.400,339.977 151.804,339.828 151.011 C 339.685 150.247,339.336 149.482,339.054 149.311 C 338.771 149.140,338.424 148.685,338.282 148.300 C 338.141 147.915,337.749 147.600,337.413 147.600 C 337.000 147.600,336.800 147.212,336.800 146.414 C 336.800 145.638,336.524 145.080,336.000 144.800 C 335.560 144.565,335.200 144.120,335.200 143.813 C 335.200 143.505,334.853 143.144,334.428 143.009 C 333.989 142.870,333.541 142.242,333.390 141.555 C 333.244 140.890,332.872 140.249,332.562 140.130 C 332.253 140.012,332.000 139.574,332.000 139.157 C 332.000 138.667,331.718 138.400,331.200 138.400 C 330.667 138.400,330.400 138.133,330.400 137.600 C 330.400 137.067,330.133 136.800,329.600 136.800 C 329.067 136.800,328.800 136.533,328.800 136.000 C 328.800 135.560,328.440 134.840,328.000 134.400 C 327.560 133.960,327.200 133.313,327.200 132.963 C 327.200 132.612,326.840 132.231,326.400 132.116 C 325.957 132.000,325.600 131.570,325.600 131.153 C 325.600 130.667,325.317 130.400,324.800 130.400 C 324.267 130.400,324.000 130.133,324.000 129.600 C 324.000 129.160,323.751 128.800,323.447 128.800 C 323.142 128.800,322.799 128.440,322.684 128.000 C 322.569 127.560,322.188 127.200,321.837 127.200 C 321.487 127.200,321.200 126.942,321.200 126.627 C 321.200 126.312,320.840 125.940,320.400 125.800 C 319.960 125.660,319.600 125.288,319.600 124.973 C 319.600 124.658,319.240 124.400,318.800 124.400 C 318.267 124.400,318.000 124.133,318.000 123.600 C 318.000 123.067,317.733 122.800,317.200 122.800 C 316.667 122.800,316.400 122.533,316.400 122.000 C 316.400 121.467,316.133 121.200,315.600 121.200 C 315.067 121.200,314.800 120.933,314.800 120.400 C 314.800 119.867,314.533 119.600,314.000 119.600 C 313.467 119.600,313.200 119.333,313.200 118.800 C 313.200 118.267,312.933 118.000,312.400 118.000 C 311.867 118.000,311.600 117.733,311.600 117.200 C 311.600 116.667,311.333 116.400,310.800 116.400 C 310.267 116.400,310.000 116.133,310.000 115.600 C 310.000 115.067,309.733 114.800,309.200 114.800 C 308.667 114.800,308.400 114.533,308.400 114.000 C 308.400 113.467,308.133 113.200,307.600 113.200 C 307.160 113.200,306.800 112.996,306.800 112.746 C 306.800 112.302,304.970 110.400,304.542 110.400 C 304.424 110.400,303.869 110.040,303.309 109.600 C 302.750 109.160,301.956 108.800,301.546 108.800 C 301.067 108.800,300.800 108.514,300.800 108.000 C 300.800 107.467,300.533 107.200,300.000 107.200 C 299.467 107.200,299.200 106.933,299.200 106.400 C 299.200 105.903,298.933 105.600,298.496 105.600 C 298.109 105.600,297.568 105.240,297.293 104.800 C 296.974 104.290,296.360 104.000,295.597 104.000 C 294.667 104.000,294.400 103.822,294.400 103.200 C 294.400 102.683,294.133 102.400,293.647 102.400 C 293.230 102.400,292.800 102.043,292.684 101.600 C 292.534 101.026,292.138 100.800,291.284 100.800 C 290.430 100.800,290.034 100.574,289.884 100.000 C 289.759 99.521,289.338 99.200,288.837 99.200 C 288.377 99.200,288.000 98.949,288.000 98.643 C 288.000 98.040,287.162 97.600,286.014 97.600 C 285.618 97.600,285.199 97.240,285.084 96.800 C 284.924 96.187,284.538 96.000,283.437 96.000 C 282.267 96.000,282.000 95.852,282.000 95.200 C 282.000 94.682,281.733 94.400,281.243 94.400 C 280.826 94.400,280.386 94.140,280.264 93.822 C 280.142 93.504,279.403 93.124,278.621 92.978 C 277.803 92.824,277.200 92.475,277.200 92.155 C 277.200 91.774,276.699 91.600,275.600 91.600 C 274.267 91.600,274.000 91.467,274.000 90.800 C 274.000 90.155,273.733 90.000,272.627 90.000 C 271.605 90.000,271.189 89.795,271.000 89.200 C 270.811 88.605,270.395 88.400,269.373 88.400 C 268.533 88.400,267.689 88.089,267.200 87.600 C 266.667 87.067,265.867 86.800,264.800 86.800 C 263.467 86.800,263.200 86.667,263.200 86.000 C 263.200 85.337,262.933 85.200,261.647 85.200 C 260.430 85.200,260.048 85.027,259.884 84.400 C 259.710 83.735,259.338 83.600,257.684 83.600 C 256.030 83.600,255.658 83.465,255.484 82.800 C 255.307 82.123,254.938 82.000,253.084 82.000 C 251.230 82.000,250.861 81.877,250.684 81.200 C 250.506 80.520,250.138 80.400,248.237 80.400 C 246.599 80.400,246.000 80.252,246.000 79.847 C 246.000 79.129,244.753 78.812,241.900 78.805 C 240.203 78.801,239.600 78.654,239.600 78.243 C 239.600 77.458,238.697 77.200,235.953 77.200 C 234.369 77.200,233.218 76.968,232.515 76.507 C 231.736 75.997,230.374 75.775,227.341 75.663 C 224.471 75.556,223.084 75.342,222.763 74.955 C 222.391 74.507,220.233 74.400,211.551 74.400 L 200.800 74.400 200.800 37.200 L 200.800 0.000 198.600 0.000 C 197.390 0.000,196.400 0.180,196.400 0.400 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path2" d="M196.400 0.400 C 196.400 0.620,196.052 0.800,195.627 0.800 C 195.202 0.800,194.740 1.160,194.600 1.600 C 194.460 2.040,194.100 2.400,193.800 2.400 C 193.500 2.400,193.140 2.760,193.000 3.200 C 192.860 3.640,192.488 4.000,192.173 4.000 C 191.858 4.000,191.600 4.360,191.600 4.800 C 191.600 5.452,191.333 5.600,190.163 5.600 C 189.062 5.600,188.676 5.787,188.516 6.400 C 188.400 6.843,187.970 7.200,187.553 7.200 C 187.067 7.200,186.800 7.483,186.800 8.000 C 186.800 8.533,186.533 8.800,186.000 8.800 C 185.560 8.800,185.200 9.049,185.200 9.353 C 185.200 9.658,184.840 10.001,184.400 10.116 C 183.960 10.231,183.600 10.592,183.600 10.918 C 183.600 11.279,183.052 11.614,182.200 11.774 C 181.362 11.931,180.800 12.270,180.800 12.618 C 180.800 12.942,180.429 13.200,179.963 13.200 C 179.462 13.200,179.041 13.521,178.916 14.000 C 178.801 14.440,178.441 14.800,178.116 14.800 C 177.791 14.800,177.431 15.160,177.316 15.600 C 177.201 16.040,176.870 16.400,176.580 16.400 C 176.291 16.400,175.940 16.760,175.800 17.200 C 175.660 17.640,175.213 18.000,174.806 18.000 C 173.639 18.000,172.800 18.436,172.800 19.043 C 172.800 19.349,172.440 19.600,172.000 19.600 C 171.467 19.600,171.200 19.867,171.200 20.400 C 171.200 20.933,170.933 21.200,170.400 21.200 C 169.867 21.200,169.600 21.467,169.600 22.000 C 169.600 22.533,169.333 22.800,168.800 22.800 C 168.267 22.800,168.000 23.067,168.000 23.600 C 168.000 24.242,167.733 24.400,166.647 24.400 C 165.630 24.400,165.241 24.599,165.084 25.200 C 164.959 25.679,164.538 26.000,164.037 26.000 C 163.577 26.000,163.200 26.249,163.200 26.553 C 163.200 26.858,162.840 27.201,162.400 27.316 C 161.960 27.431,161.600 27.791,161.600 28.116 C 161.600 28.441,161.240 28.801,160.800 28.916 C 160.360 29.031,160.000 29.412,160.000 29.763 C 160.000 30.133,159.665 30.400,159.200 30.400 C 158.760 30.400,158.040 30.760,157.600 31.200 C 157.160 31.640,156.530 32.000,156.200 32.000 C 155.867 32.000,155.600 32.356,155.600 32.800 C 155.600 33.333,155.333 33.600,154.800 33.600 C 154.267 33.600,154.000 33.867,154.000 34.400 C 154.000 34.933,153.733 35.200,153.200 35.200 C 152.667 35.200,152.400 35.467,152.400 36.000 C 152.400 36.624,152.133 36.800,151.187 36.800 C 150.452 36.800,149.880 37.048,149.733 37.431 C 149.600 37.777,149.065 38.223,148.545 38.421 C 148.025 38.618,147.600 39.055,147.600 39.390 C 147.600 39.733,147.250 40.000,146.800 40.000 C 146.267 40.000,146.000 40.267,146.000 40.800 C 146.000 41.333,145.733 41.600,145.200 41.600 C 144.760 41.600,144.400 41.856,144.400 42.168 C 144.400 42.481,143.861 42.855,143.202 42.999 C 142.544 43.144,141.869 43.487,141.702 43.761 C 141.536 44.036,141.085 44.376,140.700 44.518 C 140.315 44.659,140.000 45.051,140.000 45.387 C 140.000 45.733,139.652 46.000,139.200 46.000 C 138.667 46.000,138.400 46.267,138.400 46.800 C 138.400 47.333,138.133 47.600,137.600 47.600 C 137.067 47.600,136.800 47.867,136.800 48.400 C 136.800 48.987,136.533 49.200,135.800 49.200 C 135.250 49.200,134.471 49.529,134.069 49.931 C 133.668 50.332,133.038 50.777,132.669 50.918 C 132.301 51.059,132.000 51.451,132.000 51.787 C 132.000 52.133,131.652 52.400,131.200 52.400 C 130.667 52.400,130.400 52.667,130.400 53.200 C 130.400 53.733,130.133 54.000,129.600 54.000 C 129.067 54.000,128.800 54.267,128.800 54.800 C 128.800 55.428,128.533 55.600,127.563 55.600 C 126.662 55.600,126.268 55.817,126.116 56.400 C 126.000 56.843,125.570 57.200,125.153 57.200 C 124.667 57.200,124.400 57.483,124.400 58.000 C 124.400 58.533,124.133 58.800,123.600 58.800 C 123.156 58.800,122.800 59.067,122.800 59.400 C 122.800 59.733,122.444 60.000,122.000 60.000 C 121.482 60.000,121.200 60.267,121.200 60.755 C 121.200 61.304,120.811 61.584,119.779 61.778 C 118.997 61.924,118.258 62.304,118.136 62.622 C 118.014 62.940,117.647 63.200,117.320 63.200 C 116.993 63.200,116.631 63.560,116.516 64.000 C 116.400 64.443,115.970 64.800,115.553 64.800 C 115.067 64.800,114.800 65.083,114.800 65.600 C 114.800 66.133,114.533 66.400,114.000 66.400 C 113.467 66.400,113.200 66.667,113.200 67.200 C 113.200 67.722,112.933 68.000,112.433 68.000 C 111.241 68.000,110.400 68.431,110.400 69.043 C 110.400 69.349,110.040 69.600,109.600 69.600 C 109.067 69.600,108.800 69.867,108.800 70.400 C 108.800 70.933,108.533 71.200,108.000 71.200 C 107.467 71.200,107.200 71.467,107.200 72.000 C 107.200 72.533,106.933 72.800,106.400 72.800 C 105.867 72.800,105.600 73.067,105.600 73.600 C 105.600 74.245,105.333 74.400,104.227 74.400 C 103.205 74.400,102.789 74.605,102.600 75.200 C 102.460 75.640,101.998 76.000,101.573 76.000 C 101.148 76.000,100.800 76.249,100.800 76.553 C 100.800 76.858,100.440 77.201,100.000 77.316 C 99.560 77.431,99.200 77.812,99.200 78.163 C 99.200 78.533,98.865 78.800,98.400 78.800 C 97.882 78.800,97.600 79.067,97.600 79.555 C 97.600 80.102,97.213 80.384,96.200 80.574 C 95.362 80.731,94.800 81.070,94.800 81.418 C 94.800 81.738,94.440 82.000,94.000 82.000 C 93.467 82.000,93.200 82.267,93.200 82.800 C 93.200 83.333,92.933 83.600,92.400 83.600 C 91.867 83.600,91.600 83.867,91.600 84.400 C 91.600 84.933,91.333 85.200,90.800 85.200 C 90.267 85.200,90.000 85.467,90.000 86.000 C 90.000 86.622,89.733 86.800,88.803 86.800 C 88.040 86.800,87.426 87.090,87.107 87.600 C 86.832 88.040,86.291 88.400,85.904 88.400 C 85.467 88.400,85.200 88.703,85.200 89.200 C 85.200 89.733,84.933 90.000,84.400 90.000 C 83.867 90.000,83.600 90.267,83.600 90.800 C 83.600 91.333,83.333 91.600,82.800 91.600 C 82.360 91.600,82.000 91.862,82.000 92.182 C 82.000 92.530,81.438 92.869,80.600 93.026 C 79.798 93.177,79.200 93.526,79.200 93.845 C 79.200 94.150,78.932 94.400,78.603 94.400 C 78.275 94.400,77.782 94.760,77.507 95.200 C 77.232 95.640,76.781 96.000,76.504 96.000 C 76.227 96.000,76.000 96.287,76.000 96.637 C 76.000 96.988,75.640 97.369,75.200 97.484 C 74.003 97.797,74.003 102.203,75.200 102.516 C 75.640 102.631,76.000 103.012,76.000 103.363 C 76.000 103.713,76.230 104.000,76.511 104.000 C 76.792 104.000,77.326 104.315,77.697 104.700 C 79.244 106.305,79.862 106.750,80.903 107.011 C 81.506 107.163,82.000 107.537,82.000 107.843 C 82.000 108.150,82.360 108.400,82.800 108.400 C 83.333 108.400,83.600 108.667,83.600 109.200 C 83.600 109.733,83.867 110.000,84.400 110.000 C 84.933 110.000,85.200 110.267,85.200 110.800 C 85.200 111.297,85.467 111.600,85.904 111.600 C 86.291 111.600,86.832 111.960,87.107 112.400 C 87.426 112.910,88.040 113.200,88.803 113.200 C 89.733 113.200,90.000 113.378,90.000 114.000 C 90.000 114.533,90.267 114.800,90.800 114.800 C 91.333 114.800,91.600 115.067,91.600 115.600 C 91.600 116.133,91.867 116.400,92.400 116.400 C 92.933 116.400,93.200 116.667,93.200 117.200 C 93.200 117.733,93.467 118.000,94.000 118.000 C 94.440 118.000,94.800 118.262,94.800 118.582 C 94.800 118.930,95.362 119.269,96.200 119.426 C 97.213 119.616,97.600 119.898,97.600 120.445 C 97.600 120.918,97.881 121.200,98.353 121.200 C 98.770 121.200,99.200 121.557,99.316 122.000 C 99.431 122.440,99.812 122.800,100.163 122.800 C 100.513 122.800,100.800 123.070,100.800 123.400 C 100.800 123.730,101.154 124.000,101.586 124.000 C 102.018 124.000,102.565 124.360,102.800 124.800 C 103.080 125.324,103.638 125.600,104.414 125.600 C 105.333 125.600,105.600 125.780,105.600 126.400 C 105.600 126.933,105.867 127.200,106.400 127.200 C 106.933 127.200,107.200 127.467,107.200 128.000 C 107.200 128.533,107.467 128.800,108.000 128.800 C 108.533 128.800,108.800 129.067,108.800 129.600 C 108.800 130.133,109.067 130.400,109.600 130.400 C 110.040 130.400,110.400 130.651,110.400 130.957 C 110.400 131.569,111.241 132.000,112.433 132.000 C 112.933 132.000,113.200 132.278,113.200 132.800 C 113.200 133.333,113.467 133.600,114.000 133.600 C 114.533 133.600,114.800 133.867,114.800 134.400 C 114.800 134.917,115.067 135.200,115.553 135.200 C 115.970 135.200,116.400 135.557,116.516 136.000 C 116.631 136.440,116.993 136.800,117.320 136.800 C 117.647 136.800,118.014 137.060,118.136 137.378 C 118.258 137.696,118.997 138.076,119.779 138.222 C 120.811 138.416,121.200 138.696,121.200 139.245 C 121.200 139.733,121.482 140.000,122.000 140.000 C 122.444 140.000,122.800 140.267,122.800 140.600 C 122.800 140.933,123.156 141.200,123.600 141.200 C 124.133 141.200,124.400 141.467,124.400 142.000 C 124.400 142.533,124.667 142.800,125.200 142.800 C 125.640 142.800,126.000 143.051,126.000 143.357 C 126.000 143.969,126.841 144.400,128.033 144.400 C 128.533 144.400,128.800 144.678,128.800 145.200 C 128.800 145.733,129.067 146.000,129.600 146.000 C 130.133 146.000,130.400 146.267,130.400 146.800 C 130.400 147.317,130.667 147.600,131.153 147.600 C 131.570 147.600,132.000 147.957,132.116 148.400 C 132.241 148.879,132.662 149.200,133.163 149.200 C 133.629 149.200,134.000 149.458,134.000 149.782 C 134.000 150.130,134.562 150.469,135.400 150.626 C 136.413 150.816,136.800 151.098,136.800 151.645 C 136.800 152.133,137.082 152.400,137.600 152.400 C 138.133 152.400,138.400 152.667,138.400 153.200 C 138.400 153.733,138.667 154.000,139.200 154.000 C 139.652 154.000,140.000 154.267,140.000 154.613 C 140.000 154.949,140.315 155.341,140.700 155.482 C 141.085 155.624,141.536 155.964,141.702 156.239 C 141.869 156.513,142.544 156.856,143.202 157.001 C 143.861 157.145,144.400 157.519,144.400 157.832 C 144.400 158.144,144.760 158.400,145.200 158.400 C 145.733 158.400,146.000 158.667,146.000 159.200 C 146.000 159.733,146.267 160.000,146.800 160.000 C 147.250 160.000,147.600 160.267,147.600 160.610 C 147.600 160.945,148.025 161.382,148.545 161.579 C 149.065 161.777,149.600 162.223,149.733 162.569 C 149.880 162.952,150.452 163.200,151.187 163.200 C 152.133 163.200,152.400 163.376,152.400 164.000 C 152.400 164.533,152.667 164.800,153.200 164.800 C 153.733 164.800,154.000 165.067,154.000 165.600 C 154.000 166.133,154.267 166.400,154.800 166.400 C 155.333 166.400,155.600 166.667,155.600 167.200 C 155.600 167.718,155.867 168.000,156.357 168.000 C 156.774 168.000,157.212 168.253,157.330 168.562 C 157.449 168.872,158.098 169.246,158.773 169.394 C 159.483 169.550,160.000 169.919,160.000 170.269 C 160.000 170.602,160.360 170.969,160.800 171.084 C 161.240 171.199,161.600 171.559,161.600 171.884 C 161.600 172.209,161.960 172.569,162.400 172.684 C 162.840 172.799,163.200 173.057,163.200 173.257 C 163.200 173.456,163.650 173.791,164.200 174.000 C 164.750 174.209,165.200 174.655,165.200 174.990 C 165.200 175.420,165.612 175.600,166.600 175.600 C 167.733 175.600,168.000 175.752,168.000 176.400 C 168.000 176.933,168.267 177.200,168.800 177.200 C 169.333 177.200,169.600 177.467,169.600 178.000 C 169.600 178.533,169.867 178.800,170.400 178.800 C 170.933 178.800,171.200 179.067,171.200 179.600 C 171.200 180.044,171.467 180.400,171.800 180.400 C 172.130 180.400,172.760 180.760,173.200 181.200 C 173.640 181.640,174.348 182.000,174.773 182.000 C 175.198 182.000,175.660 182.360,175.800 182.800 C 175.940 183.240,176.312 183.600,176.627 183.600 C 176.942 183.600,177.200 183.876,177.200 184.213 C 177.200 184.549,177.515 184.943,177.900 185.086 C 178.285 185.230,178.835 185.674,179.123 186.074 C 179.410 186.473,179.815 186.800,180.023 186.800 C 180.230 186.800,180.760 187.160,181.200 187.600 C 181.640 188.040,182.360 188.400,182.800 188.400 C 183.265 188.400,183.600 188.667,183.600 189.037 C 183.600 189.388,183.960 189.769,184.400 189.884 C 184.840 189.999,185.200 190.342,185.200 190.647 C 185.200 190.951,185.560 191.200,186.000 191.200 C 186.533 191.200,186.800 191.467,186.800 192.000 C 186.800 192.497,187.067 192.800,187.504 192.800 C 187.891 192.800,188.432 193.160,188.707 193.600 C 189.026 194.110,189.640 194.400,190.403 194.400 C 191.333 194.400,191.600 194.578,191.600 195.200 C 191.600 195.640,191.858 196.000,192.173 196.000 C 192.488 196.000,192.860 196.360,193.000 196.800 C 193.140 197.240,193.500 197.600,193.800 197.600 C 194.100 197.600,194.460 197.960,194.600 198.400 C 194.740 198.840,195.202 199.200,195.627 199.200 C 196.052 199.200,196.400 199.451,196.400 199.757 C 196.400 200.477,197.278 200.800,199.233 200.800 L 200.800 200.800 200.800 163.900 L 200.799 127.000 209.400 127.115 C 217.639 127.225,218.000 127.263,218.000 128.015 C 218.000 128.743,218.292 128.800,222.000 128.800 C 225.733 128.800,226.000 128.853,226.000 129.600 C 226.000 130.302,226.267 130.400,228.186 130.400 C 229.962 130.400,230.452 130.550,230.800 131.200 C 231.135 131.827,231.638 132.000,233.118 132.000 C 234.574 132.000,235.122 132.183,235.507 132.800 C 235.898 133.426,236.440 133.600,238.003 133.600 C 239.733 133.600,240.000 133.707,240.000 134.400 C 240.000 135.067,240.267 135.200,241.600 135.200 C 242.667 135.200,243.467 135.467,244.000 136.000 C 244.485 136.485,245.333 136.800,246.153 136.800 C 247.170 136.800,247.559 136.999,247.716 137.600 C 247.875 138.206,248.262 138.400,249.316 138.400 C 250.370 138.400,250.757 138.594,250.916 139.200 C 251.031 139.640,251.457 140.006,251.863 140.013 C 252.268 140.020,252.949 140.290,253.376 140.613 C 253.804 140.936,254.479 141.200,254.876 141.200 C 255.333 141.200,255.600 141.495,255.600 142.000 C 255.600 142.667,255.867 142.800,257.200 142.800 C 258.533 142.800,258.800 142.933,258.800 143.600 C 258.800 144.117,259.067 144.400,259.553 144.400 C 259.970 144.400,260.400 144.757,260.516 145.200 C 260.668 145.783,261.062 146.000,261.963 146.000 C 262.933 146.000,263.200 146.172,263.200 146.800 C 263.200 147.317,263.467 147.600,263.953 147.600 C 264.370 147.600,264.800 147.957,264.916 148.400 C 265.076 149.013,265.462 149.200,266.563 149.200 C 267.733 149.200,268.000 149.348,268.000 150.000 C 268.000 150.533,268.267 150.800,268.800 150.800 C 269.333 150.800,269.600 151.067,269.600 151.600 C 269.600 152.133,269.867 152.400,270.400 152.400 C 270.865 152.400,271.200 152.667,271.200 153.037 C 271.200 153.388,271.560 153.769,272.000 153.884 C 272.440 153.999,272.800 154.330,272.800 154.620 C 272.800 154.909,273.160 155.260,273.600 155.400 C 274.040 155.540,274.400 155.912,274.400 156.227 C 274.400 156.542,274.760 156.800,275.200 156.800 C 275.665 156.800,276.000 157.067,276.000 157.437 C 276.000 157.788,276.360 158.169,276.800 158.284 C 277.240 158.399,277.600 158.736,277.600 159.033 C 277.600 159.329,277.960 159.765,278.400 160.000 C 278.840 160.235,279.200 160.692,279.200 161.014 C 279.200 161.336,279.458 161.600,279.773 161.600 C 280.088 161.600,280.460 161.960,280.600 162.400 C 280.740 162.840,281.112 163.200,281.427 163.200 C 281.742 163.200,282.000 163.487,282.000 163.837 C 282.000 164.188,282.360 164.569,282.800 164.684 C 283.243 164.800,283.600 165.230,283.600 165.647 C 283.600 166.133,283.883 166.400,284.400 166.400 C 284.933 166.400,285.200 166.667,285.200 167.200 C 285.200 167.733,285.467 168.000,286.000 168.000 C 286.497 168.000,286.800 168.267,286.800 168.704 C 286.800 169.091,287.160 169.632,287.600 169.907 C 288.040 170.182,288.400 170.834,288.400 171.357 C 288.400 171.970,288.683 172.381,289.200 172.516 C 289.640 172.631,290.000 173.000,290.000 173.336 C 290.000 173.671,290.360 174.060,290.800 174.200 C 291.240 174.340,291.600 174.789,291.600 175.199 C 291.600 176.135,293.247 178.760,293.849 178.783 C 294.096 178.792,294.413 179.520,294.554 180.400 C 294.719 181.435,295.020 182.000,295.405 182.000 C 295.733 182.000,296.000 182.358,296.000 182.800 C 296.000 183.240,296.360 183.960,296.800 184.400 C 297.240 184.840,297.600 185.560,297.600 186.000 C 297.600 186.533,297.867 186.800,298.400 186.800 C 299.052 186.800,299.200 187.067,299.200 188.237 C 299.200 189.308,299.392 189.725,299.952 189.872 C 300.506 190.016,300.758 190.549,300.909 191.894 C 301.032 192.985,301.374 193.866,301.758 194.080 C 302.178 194.316,302.400 194.985,302.400 196.020 C 302.400 197.333,302.535 197.600,303.200 197.600 C 303.893 197.600,304.000 197.867,304.000 199.586 C 304.000 201.162,304.165 201.660,304.800 202.000 C 305.438 202.342,305.600 202.838,305.600 204.452 C 305.600 206.138,305.733 206.510,306.400 206.684 C 307.084 206.863,307.200 207.230,307.200 209.213 C 307.200 210.538,307.388 211.596,307.638 211.679 C 308.190 211.863,308.760 214.760,308.783 217.500 C 308.795 218.991,308.957 219.600,309.342 219.600 C 309.775 219.600,309.926 221.386,310.096 228.500 C 310.395 241.007,310.020 255.600,309.400 255.600 C 309.081 255.600,308.836 256.776,308.672 259.096 C 308.499 261.553,308.243 262.725,307.813 263.040 C 307.390 263.349,307.200 264.175,307.200 265.697 C 307.200 267.570,307.078 267.939,306.400 268.116 C 305.723 268.293,305.600 268.662,305.600 270.516 C 305.600 272.370,305.477 272.739,304.800 272.916 C 304.134 273.090,304.000 273.462,304.000 275.136 C 304.000 276.795,303.860 277.190,303.200 277.400 C 302.579 277.597,302.400 278.005,302.400 279.227 C 302.400 280.300,302.224 280.800,301.847 280.800 C 301.216 280.800,300.813 282.000,300.805 283.900 C 300.801 284.932,300.635 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.935 288.400,297.600 288.667,297.600 289.037 C 297.600 289.387,297.240 290.131,296.800 290.691 C 296.360 291.250,296.000 292.044,296.000 292.454 C 296.000 292.864,295.749 293.200,295.443 293.200 C 294.831 293.200,294.400 294.041,294.400 295.233 C 294.400 295.655,294.133 296.000,293.808 296.000 C 293.482 296.000,293.102 296.450,292.964 297.000 C 292.826 297.550,292.463 298.000,292.157 298.000 C 291.787 298.000,291.600 298.471,291.600 299.400 C 291.600 300.533,291.448 300.800,290.800 300.800 C 290.267 300.800,290.000 301.067,290.000 301.600 C 290.000 302.133,289.733 302.400,289.200 302.400 C 288.578 302.400,288.400 302.667,288.400 303.597 C 288.400 304.360,288.110 304.974,287.600 305.293 C 287.160 305.568,286.800 306.109,286.800 306.496 C 286.800 306.933,286.497 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.935 308.800,283.600 309.067,283.600 309.437 C 283.600 309.788,283.240 310.169,282.800 310.284 C 282.360 310.399,282.000 310.676,282.000 310.899 C 282.000 311.123,281.370 311.900,280.600 312.626 C 279.830 313.352,279.200 314.126,279.200 314.346 C 279.200 314.566,278.840 314.860,278.400 315.000 C 277.960 315.140,277.600 315.491,277.600 315.780 C 277.600 316.070,277.240 316.401,276.800 316.516 C 276.360 316.631,276.000 316.991,276.000 317.316 C 276.000 317.641,275.640 318.001,275.200 318.116 C 274.760 318.231,274.400 318.612,274.400 318.963 C 274.400 319.333,274.065 319.600,273.600 319.600 C 273.067 319.600,272.800 319.867,272.800 320.400 C 272.800 320.933,272.533 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.118,269.333 324.400,268.843 324.400 C 268.426 324.400,267.988 324.653,267.870 324.962 C 267.751 325.272,267.103 325.646,266.429 325.794 C 265.756 325.941,265.069 326.287,264.902 326.561 C 264.736 326.836,264.285 327.176,263.900 327.318 C 263.515 327.459,263.200 327.831,263.200 328.143 C 263.200 328.475,262.619 328.820,261.800 328.974 C 260.962 329.131,260.400 329.470,260.400 329.818 C 260.400 330.138,260.040 330.400,259.600 330.400 C 259.067 330.400,258.800 330.667,258.800 331.200 C 258.800 331.852,258.533 332.000,257.363 332.000 C 256.262 332.000,255.876 332.187,255.716 332.800 C 255.600 333.243,255.170 333.600,254.753 333.600 C 254.339 333.600,253.640 333.960,253.200 334.400 C 252.760 334.840,252.083 335.200,251.696 335.200 C 251.309 335.200,250.768 335.560,250.493 336.000 C 250.174 336.510,249.560 336.800,248.797 336.800 C 247.867 336.800,247.600 336.978,247.600 337.600 C 247.600 338.261,247.333 338.400,246.062 338.400 C 245.032 338.400,244.285 338.664,243.800 339.200 C 243.315 339.736,242.568 340.000,241.538 340.000 C 240.267 340.000,240.000 340.139,240.000 340.800 C 240.000 341.502,239.733 341.600,237.820 341.600 C 236.415 341.600,235.526 341.792,235.320 342.140 C 235.144 342.436,234.106 342.798,233.014 342.944 C 231.903 343.092,230.880 343.471,230.694 343.804 C 230.465 344.213,229.706 344.400,228.276 344.400 C 226.626 344.400,226.089 344.566,225.693 345.200 C 225.256 345.899,224.760 346.000,221.759 346.000 C 218.662 346.000,218.305 346.078,218.116 346.800 C 217.916 347.566,217.570 347.600,209.986 347.600 C 201.767 347.600,200.800 347.710,200.800 348.643 C 200.800 348.949,200.440 349.200,200.000 349.200 C 199.560 349.200,199.200 348.949,199.200 348.643 C 199.200 347.710,198.233 347.600,190.014 347.600 C 182.430 347.600,182.084 347.566,181.884 346.800 C 181.695 346.078,181.338 346.000,178.241 346.000 C 175.240 346.000,174.744 345.899,174.307 345.200 C 173.911 344.566,173.374 344.400,171.724 344.400 C 170.294 344.400,169.535 344.213,169.306 343.804 C 169.120 343.471,168.097 343.092,166.986 342.944 C 165.894 342.798,164.856 342.436,164.680 342.140 C 164.474 341.792,163.585 341.600,162.180 341.600 C 160.267 341.600,160.000 341.502,160.000 340.800 C 160.000 340.137,159.733 340.000,158.447 340.000 C 157.230 340.000,156.848 339.827,156.684 339.200 C 156.509 338.532,156.138 338.400,154.437 338.400 C 152.667 338.400,152.400 338.295,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.467,148.933 335.200,148.400 335.200 C 147.960 335.200,147.240 334.840,146.800 334.400 C 146.360 333.960,145.661 333.600,145.247 333.600 C 144.830 333.600,144.400 333.243,144.284 332.800 C 144.124 332.187,143.738 332.000,142.637 332.000 C 141.467 332.000,141.200 331.852,141.200 331.200 C 141.200 330.756,140.933 330.400,140.600 330.400 C 140.270 330.400,139.640 330.040,139.200 329.600 C 138.760 329.160,138.040 328.800,137.600 328.800 C 137.135 328.800,136.800 328.533,136.800 328.163 C 136.800 327.812,136.440 327.431,136.000 327.316 C 135.560 327.201,135.200 326.942,135.200 326.741 C 135.200 326.540,134.885 326.260,134.500 326.119 C 134.115 325.979,133.371 325.534,132.846 325.132 C 132.321 324.729,131.556 324.400,131.146 324.400 C 130.667 324.400,130.400 324.114,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.867 319.600,125.600 319.333,125.600 318.800 C 125.600 318.267,125.333 318.000,124.800 318.000 C 124.335 318.000,124.000 317.733,124.000 317.363 C 124.000 317.012,123.640 316.631,123.200 316.516 C 122.760 316.401,122.400 316.058,122.400 315.753 C 122.400 315.449,122.124 315.200,121.787 315.200 C 121.451 315.200,121.055 314.885,120.908 314.500 C 120.761 314.115,120.046 313.239,119.320 312.553 C 118.594 311.867,118.000 311.123,118.000 310.899 C 118.000 310.676,117.640 310.399,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.503 307.200,113.200 306.933,113.200 306.496 C 113.200 306.109,112.840 305.568,112.400 305.293 C 111.935 305.003,111.600 304.360,111.600 303.759 C 111.600 303.062,111.340 302.657,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.552 300.800,108.400 300.533,108.400 299.400 C 108.400 298.471,108.213 298.000,107.843 298.000 C 107.537 298.000,107.174 297.550,107.036 297.000 C 106.898 296.450,106.518 296.000,106.192 296.000 C 105.867 296.000,105.600 295.655,105.600 295.233 C 105.600 294.041,105.169 293.200,104.557 293.200 C 104.251 293.200,104.000 292.864,104.000 292.454 C 104.000 292.044,103.640 291.250,103.200 290.691 C 102.760 290.131,102.400 289.431,102.400 289.133 C 102.400 288.836,102.040 288.368,101.600 288.093 C 101.090 287.774,100.800 287.160,100.800 286.397 C 100.800 285.467,100.622 285.200,100.000 285.200 C 99.365 285.200,99.199 284.932,99.195 283.900 C 99.187 282.000,98.784 280.800,98.153 280.800 C 97.776 280.800,97.600 280.300,97.600 279.227 C 97.600 278.005,97.421 277.597,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.527 272.740,94.400 272.370,94.400 270.580 C 94.400 268.805,94.268 268.412,93.600 268.200 C 92.926 267.986,92.800 267.595,92.800 265.717 C 92.800 264.177,92.611 263.350,92.187 263.040 C 91.757 262.725,91.501 261.553,91.328 259.096 C 91.164 256.771,90.920 255.600,90.599 255.600 C 90.243 255.600,90.061 253.269,89.905 246.729 C 89.716 238.778,89.619 237.803,88.970 237.329 C 88.388 236.903,83.221 236.800,62.524 236.800 L 36.800 236.800 36.800 248.304 C 36.800 259.374,36.830 259.826,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.528 277.200,41.600 277.467,41.600 280.180 C 41.600 282.268,41.763 283.256,42.143 283.480 C 42.442 283.656,42.784 284.689,42.903 285.776 C 43.028 286.917,43.389 287.949,43.759 288.220 C 44.191 288.535,44.400 289.307,44.400 290.582 C 44.400 292.138,44.542 292.512,45.200 292.684 C 45.813 292.845,46.001 293.232,46.005 294.347 C 46.013 296.391,46.400 297.600,47.047 297.600 C 47.426 297.600,47.600 298.104,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.067 300.800,49.200 301.067,49.200 302.400 C 49.200 303.467,49.467 304.267,50.000 304.800 C 50.455 305.255,50.800 306.133,50.800 306.837 C 50.800 307.738,51.017 308.132,51.600 308.284 C 52.206 308.443,52.400 308.830,52.400 309.884 C 52.400 310.938,52.594 311.325,53.200 311.484 C 53.806 311.643,54.000 312.030,54.000 313.084 C 54.000 314.138,54.194 314.525,54.800 314.684 C 55.364 314.832,55.600 315.230,55.600 316.033 C 55.600 316.762,55.887 317.326,56.400 317.600 C 56.840 317.835,57.200 318.361,57.200 318.767 C 57.200 319.174,57.560 319.601,58.000 319.716 C 58.585 319.869,58.800 320.262,58.800 321.175 C 58.800 321.907,59.044 322.519,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 62.979 327.200,63.200 327.467,63.200 328.167 C 63.200 329.548,63.598 330.400,64.243 330.400 C 64.549 330.400,64.800 330.760,64.800 331.200 C 64.800 331.718,65.067 332.000,65.555 332.000 C 66.102 332.000,66.384 332.387,66.574 333.400 C 66.731 334.238,67.070 334.800,67.418 334.800 C 67.742 334.800,68.000 335.171,68.000 335.637 C 68.000 336.138,68.321 336.559,68.800 336.684 C 69.243 336.800,69.600 337.230,69.600 337.647 C 69.600 338.133,69.883 338.400,70.400 338.400 C 70.924 338.400,71.200 338.667,71.200 339.173 C 71.200 339.598,71.560 340.060,72.000 340.200 C 72.560 340.378,72.800 340.805,72.800 341.627 C 72.800 342.533,72.982 342.800,73.600 342.800 C 74.117 342.800,74.400 343.067,74.400 343.553 C 74.400 343.970,74.757 344.400,75.200 344.516 C 75.640 344.631,76.000 345.012,76.000 345.363 C 76.000 345.713,76.270 346.000,76.600 346.000 C 76.930 346.000,77.200 346.287,77.200 346.637 C 77.200 346.988,77.560 347.369,78.000 347.484 C 78.443 347.600,78.800 348.030,78.800 348.447 C 78.800 348.933,79.083 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.333 360.000,91.600 360.267,91.600 360.800 C 91.600 361.333,91.867 361.600,92.400 361.600 C 92.917 361.600,93.200 361.867,93.200 362.353 C 93.200 362.770,93.557 363.200,94.000 363.316 C 94.440 363.431,94.800 363.812,94.800 364.163 C 94.800 364.575,95.151 364.800,95.797 364.800 C 96.360 364.800,97.010 365.148,97.293 365.600 C 97.568 366.040,98.109 366.400,98.496 366.400 C 98.933 366.400,99.200 366.703,99.200 367.200 C 99.200 367.733,99.467 368.000,100.000 368.000 C 100.450 368.000,100.800 368.267,100.800 368.610 C 100.800 368.945,101.250 369.391,101.800 369.600 C 102.350 369.809,102.800 370.156,102.800 370.372 C 102.800 370.587,103.430 370.882,104.200 371.026 C 105.052 371.186,105.600 371.521,105.600 371.882 C 105.600 372.208,105.960 372.569,106.400 372.684 C 106.840 372.799,107.200 373.122,107.200 373.402 C 107.200 373.682,107.813 374.026,108.561 374.166 C 109.310 374.307,110.024 374.687,110.149 375.011 C 110.273 375.335,110.741 375.600,111.187 375.600 C 111.733 375.600,112.000 375.863,112.000 376.400 C 112.000 377.048,112.267 377.200,113.400 377.200 C 114.533 377.200,114.800 377.352,114.800 378.000 C 114.800 378.667,115.067 378.800,116.400 378.800 C 117.733 378.800,118.000 378.933,118.000 379.600 C 118.000 380.097,118.267 380.400,118.704 380.400 C 119.091 380.400,119.632 380.760,119.907 381.200 C 120.219 381.699,120.840 382.000,121.557 382.000 C 122.370 382.000,122.768 382.234,122.916 382.800 C 123.075 383.406,123.462 383.600,124.516 383.600 C 125.570 383.600,125.957 383.794,126.116 384.400 C 126.276 385.013,126.662 385.200,127.763 385.200 C 128.754 385.200,129.200 385.381,129.200 385.782 C 129.200 386.134,129.774 386.471,130.655 386.637 C 131.455 386.787,132.445 387.245,132.855 387.655 C 133.333 388.133,134.173 388.400,135.200 388.400 C 136.301 388.400,136.800 388.574,136.800 388.957 C 136.800 389.602,137.652 390.000,139.033 390.000 C 139.626 390.000,140.000 390.232,140.000 390.600 C 140.000 391.044,140.467 391.200,141.800 391.200 C 143.067 391.200,143.837 391.437,144.400 392.000 C 144.987 392.587,145.733 392.800,147.200 392.800 C 148.933 392.800,149.200 392.907,149.200 393.600 C 149.200 394.309,149.467 394.400,151.553 394.400 C 153.570 394.400,153.937 394.514,154.116 395.200 C 154.302 395.911,154.662 396.000,157.363 396.000 C 160.133 396.000,160.400 396.070,160.400 396.800 C 160.400 397.537,160.667 397.600,163.797 397.600 C 166.760 397.600,167.257 397.702,167.693 398.400 C 168.144 399.123,168.626 399.200,172.696 399.200 C 175.432 399.200,177.200 399.357,177.200 399.600 C 177.200 399.862,185.067 400.000,200.000 400.000 C 214.933 400.000,222.800 399.862,222.800 399.600 C 222.800 399.357,224.568 399.200,227.304 399.200 C 231.374 399.200,231.856 399.123,232.307 398.400 C 232.743 397.702,233.240 397.600,236.203 397.600 C 239.333 397.600,239.600 397.537,239.600 396.800 C 239.600 396.070,239.867 396.000,242.637 396.000 C 245.338 396.000,245.698 395.911,245.884 395.200 C 246.063 394.514,246.430 394.400,248.447 394.400 C 250.533 394.400,250.800 394.309,250.800 393.600 C 250.800 392.901,251.067 392.800,252.911 392.800 C 254.527 392.800,255.183 392.612,255.707 392.000 C 256.204 391.420,256.887 391.200,258.196 391.200 C 259.533 391.200,260.000 391.045,260.000 390.600 C 260.000 390.178,260.426 390.000,261.437 390.000 C 262.538 390.000,262.924 389.813,263.084 389.200 C 263.248 388.573,263.630 388.400,264.847 388.400 C 265.867 388.400,266.675 388.125,267.200 387.600 C 267.640 387.160,268.452 386.800,269.004 386.800 C 269.556 386.800,270.316 386.440,270.693 386.000 C 271.083 385.545,271.873 385.200,272.526 385.200 C 273.338 385.200,273.736 384.966,273.884 384.400 C 274.043 383.794,274.430 383.600,275.484 383.600 C 276.538 383.600,276.925 383.406,277.084 382.800 C 277.232 382.234,277.630 382.000,278.443 382.000 C 279.160 382.000,279.781 381.699,280.093 381.200 C 280.368 380.760,280.909 380.400,281.296 380.400 C 281.733 380.400,282.000 380.097,282.000 379.600 C 282.000 378.933,282.267 378.800,283.600 378.800 C 284.933 378.800,285.200 378.667,285.200 378.000 C 285.200 377.352,285.467 377.200,286.600 377.200 C 287.733 377.200,288.000 377.048,288.000 376.400 C 288.000 375.863,288.267 375.600,288.813 375.600 C 289.259 375.600,289.727 375.335,289.851 375.011 C 289.976 374.687,290.690 374.307,291.439 374.166 C 292.187 374.026,292.800 373.682,292.800 373.402 C 292.800 373.122,293.160 372.799,293.600 372.684 C 294.040 372.569,294.400 372.208,294.400 371.882 C 294.400 371.521,294.948 371.186,295.800 371.026 C 296.570 370.882,297.200 370.587,297.200 370.372 C 297.200 370.156,297.650 369.809,298.200 369.600 C 298.750 369.391,299.200 368.945,299.200 368.610 C 299.200 368.267,299.550 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.689,301.067 366.400,301.538 366.400 C 301.944 366.400,302.602 366.040,303.000 365.600 C 303.398 365.160,304.056 364.800,304.462 364.800 C 304.871 364.800,305.200 364.515,305.200 364.163 C 305.200 363.812,305.560 363.431,306.000 363.316 C 306.440 363.201,306.800 362.841,306.800 362.516 C 306.800 362.191,307.160 361.831,307.600 361.716 C 308.043 361.600,308.400 361.170,308.400 360.753 C 308.400 360.267,308.683 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.151,311.600 357.847 C 311.600 357.542,311.960 357.199,312.400 357.084 C 312.840 356.969,313.200 356.588,313.200 356.237 C 313.200 355.867,313.535 355.600,314.000 355.600 C 314.533 355.600,314.800 355.333,314.800 354.800 C 314.800 354.267,315.067 354.000,315.600 354.000 C 316.133 354.000,316.400 353.733,316.400 353.200 C 316.400 352.667,316.667 352.400,317.200 352.400 C 317.733 352.400,318.000 352.133,318.000 351.600 C 318.000 351.067,318.267 350.800,318.800 350.800 C 319.333 350.800,319.600 350.533,319.600 350.000 C 319.600 349.467,319.867 349.200,320.400 349.200 C 320.917 349.200,321.200 348.933,321.200 348.447 C 321.200 348.030,321.557 347.600,322.000 347.484 C 322.440 347.369,322.800 346.988,322.800 346.637 C 322.800 346.287,323.070 346.000,323.400 346.000 C 323.730 346.000,324.000 345.713,324.000 345.363 C 324.000 345.012,324.360 344.631,324.800 344.516 C 325.243 344.400,325.600 343.970,325.600 343.553 C 325.600 343.067,325.883 342.800,326.400 342.800 C 327.018 342.800,327.200 342.533,327.200 341.627 C 327.200 340.805,327.440 340.378,328.000 340.200 C 328.440 340.060,328.800 339.598,328.800 339.173 C 328.800 338.667,329.076 338.400,329.600 338.400 C 330.117 338.400,330.400 338.133,330.400 337.647 C 330.400 337.230,330.757 336.800,331.200 336.684 C 331.679 336.559,332.000 336.138,332.000 335.637 C 332.000 335.171,332.258 334.800,332.582 334.800 C 332.930 334.800,333.269 334.238,333.426 333.400 C 333.616 332.387,333.898 332.000,334.445 332.000 C 334.933 332.000,335.200 331.718,335.200 331.200 C 335.200 330.760,335.451 330.400,335.757 330.400 C 336.402 330.400,336.800 329.548,336.800 328.167 C 336.800 327.467,337.021 327.200,337.600 327.200 C 338.133 327.200,338.400 326.933,338.400 326.400 C 338.400 325.960,338.650 325.600,338.955 325.600 C 339.271 325.600,339.621 325.011,339.766 324.239 C 339.907 323.490,340.287 322.776,340.611 322.651 C 340.956 322.519,341.200 321.907,341.200 321.175 C 341.200 320.262,341.415 319.869,342.000 319.716 C 342.440 319.601,342.800 319.174,342.800 318.767 C 342.800 318.361,343.160 317.835,343.600 317.600 C 344.113 317.326,344.400 316.762,344.400 316.033 C 344.400 315.230,344.636 314.832,345.200 314.684 C 345.806 314.525,346.000 314.138,346.000 313.084 C 346.000 312.030,346.194 311.643,346.800 311.484 C 347.406 311.325,347.600 310.938,347.600 309.884 C 347.600 308.830,347.794 308.443,348.400 308.284 C 348.983 308.132,349.200 307.738,349.200 306.837 C 349.200 306.133,349.545 305.255,350.000 304.800 C 350.533 304.267,350.800 303.467,350.800 302.400 C 350.800 301.067,350.933 300.800,351.600 300.800 C 352.248 300.800,352.400 300.533,352.400 299.400 C 352.400 298.533,352.705 297.695,353.200 297.200 C 353.757 296.643,354.000 295.867,354.000 294.647 C 354.000 293.230,354.153 292.853,354.800 292.684 C 355.458 292.512,355.600 292.138,355.600 290.582 C 355.600 289.307,355.809 288.535,356.241 288.220 C 356.611 287.949,356.972 286.917,357.097 285.776 C 357.216 284.689,357.558 283.656,357.857 283.480 C 358.237 283.256,358.400 282.268,358.400 280.180 C 358.400 277.467,358.472 277.200,359.200 277.200 C 359.937 277.200,360.000 276.933,360.000 273.803 C 360.000 270.840,360.102 270.343,360.800 269.907 C 361.519 269.458,361.600 268.974,361.600 265.107 C 361.600 261.240,361.681 260.756,362.400 260.307 C 363.185 259.817,363.200 259.374,363.200 237.400 C 363.200 215.426,363.185 214.983,362.400 214.493 C 361.685 214.046,361.600 213.560,361.600 209.893 C 361.600 206.226,361.515 205.740,360.800 205.293 C 360.101 204.856,360.000 204.360,360.000 201.359 C 360.000 198.262,359.922 197.905,359.200 197.716 C 358.491 197.531,358.400 197.170,358.400 194.553 C 358.400 192.195,358.279 191.600,357.800 191.600 C 357.374 191.600,357.198 191.164,357.195 190.100 C 357.187 188.011,356.805 186.800,356.153 186.800 C 355.766 186.800,355.600 186.271,355.600 185.033 C 355.600 182.886,355.296 182.000,354.557 182.000 C 354.196 182.000,353.998 181.542,353.995 180.700 C 353.987 178.800,353.584 177.600,352.953 177.600 C 352.574 177.600,352.400 177.096,352.400 176.000 C 352.400 174.703,352.258 174.400,351.651 174.400 C 351.042 174.400,350.865 174.017,350.704 172.346 C 350.577 171.017,350.276 170.162,349.854 169.926 C 349.441 169.695,349.200 169.038,349.200 168.143 C 349.200 167.062,349.010 166.675,348.400 166.516 C 347.803 166.360,347.600 165.970,347.600 164.980 C 347.600 164.005,347.388 163.587,346.800 163.400 C 346.205 163.211,346.000 162.795,346.000 161.773 C 346.000 160.667,345.845 160.400,345.200 160.400 C 344.548 160.400,344.400 160.133,344.400 158.963 C 344.400 157.862,344.213 157.476,343.600 157.316 C 343.157 157.200,342.800 156.770,342.800 156.353 C 342.800 155.939,342.549 155.600,342.243 155.600 C 341.598 155.600,341.200 154.748,341.200 153.367 C 341.200 152.809,340.965 152.400,340.645 152.400 C 340.327 152.400,339.977 151.804,339.828 151.011 C 339.685 150.247,339.336 149.482,339.054 149.311 C 338.771 149.140,338.424 148.685,338.282 148.300 C 338.141 147.915,337.749 147.600,337.413 147.600 C 337.000 147.600,336.800 147.212,336.800 146.414 C 336.800 145.638,336.524 145.080,336.000 144.800 C 335.560 144.565,335.200 144.120,335.200 143.813 C 335.200 143.505,334.853 143.144,334.428 143.009 C 333.989 142.870,333.541 142.242,333.390 141.555 C 333.244 140.890,332.872 140.249,332.562 140.130 C 332.253 140.012,332.000 139.574,332.000 139.157 C 332.000 138.667,331.718 138.400,331.200 138.400 C 330.667 138.400,330.400 138.133,330.400 137.600 C 330.400 137.067,330.133 136.800,329.600 136.800 C 329.067 136.800,328.800 136.533,328.800 136.000 C 328.800 135.560,328.440 134.840,328.000 134.400 C 327.560 133.960,327.200 133.313,327.200 132.963 C 327.200 132.612,326.840 132.231,326.400 132.116 C 325.957 132.000,325.600 131.570,325.600 131.153 C 325.600 130.667,325.317 130.400,324.800 130.400 C 324.267 130.400,324.000 130.133,324.000 129.600 C 324.000 129.160,323.751 128.800,323.447 128.800 C 323.142 128.800,322.799 128.440,322.684 128.000 C 322.569 127.560,322.188 127.200,321.837 127.200 C 321.487 127.200,321.200 126.942,321.200 126.627 C 321.200 126.312,320.840 125.940,320.400 125.800 C 319.960 125.660,319.600 125.288,319.600 124.973 C 319.600 124.658,319.240 124.400,318.800 124.400 C 318.267 124.400,318.000 124.133,318.000 123.600 C 318.000 123.067,317.733 122.800,317.200 122.800 C 316.667 122.800,316.400 122.533,316.400 122.000 C 316.400 121.467,316.133 121.200,315.600 121.200 C 315.067 121.200,314.800 120.933,314.800 120.400 C 314.800 119.867,314.533 119.600,314.000 119.600 C 313.467 119.600,313.200 119.333,313.200 118.800 C 313.200 118.267,312.933 118.000,312.400 118.000 C 311.867 118.000,311.600 117.733,311.600 117.200 C 311.600 116.667,311.333 116.400,310.800 116.400 C 310.267 116.400,310.000 116.133,310.000 115.600 C 310.000 115.067,309.733 114.800,309.200 114.800 C 308.667 114.800,308.400 114.533,308.400 114.000 C 308.400 113.467,308.133 113.200,307.600 113.200 C 307.160 113.200,306.800 112.996,306.800 112.746 C 306.800 112.302,304.970 110.400,304.542 110.400 C 304.424 110.400,303.869 110.040,303.309 109.600 C 302.750 109.160,301.956 108.800,301.546 108.800 C 301.067 108.800,300.800 108.514,300.800 108.000 C 300.800 107.467,300.533 107.200,300.000 107.200 C 299.467 107.200,299.200 106.933,299.200 106.400 C 299.200 105.903,298.933 105.600,298.496 105.600 C 298.109 105.600,297.568 105.240,297.293 104.800 C 296.974 104.290,296.360 104.000,295.597 104.000 C 294.667 104.000,294.400 103.822,294.400 103.200 C 294.400 102.683,294.133 102.400,293.647 102.400 C 293.230 102.400,292.800 102.043,292.684 101.600 C 292.534 101.026,292.138 100.800,291.284 100.800 C 290.430 100.800,290.034 100.574,289.884 100.000 C 289.759 99.521,289.338 99.200,288.837 99.200 C 288.377 99.200,288.000 98.949,288.000 98.643 C 288.000 98.040,287.162 97.600,286.014 97.600 C 285.618 97.600,285.199 97.240,285.084 96.800 C 284.924 96.187,284.538 96.000,283.437 96.000 C 282.267 96.000,282.000 95.852,282.000 95.200 C 282.000 94.682,281.733 94.400,281.243 94.400 C 280.826 94.400,280.386 94.140,280.264 93.822 C 280.142 93.504,279.403 93.124,278.621 92.978 C 277.803 92.824,277.200 92.475,277.200 92.155 C 277.200 91.774,276.699 91.600,275.600 91.600 C 274.267 91.600,274.000 91.467,274.000 90.800 C 274.000 90.155,273.733 90.000,272.627 90.000 C 271.605 90.000,271.189 89.795,271.000 89.200 C 270.811 88.605,270.395 88.400,269.373 88.400 C 268.533 88.400,267.689 88.089,267.200 87.600 C 266.667 87.067,265.867 86.800,264.800 86.800 C 263.467 86.800,263.200 86.667,263.200 86.000 C 263.200 85.337,262.933 85.200,261.647 85.200 C 260.430 85.200,260.048 85.027,259.884 84.400 C 259.710 83.735,259.338 83.600,257.684 83.600 C 256.030 83.600,255.658 83.465,255.484 82.800 C 255.307 82.123,254.938 82.000,253.084 82.000 C 251.230 82.000,250.861 81.877,250.684 81.200 C 250.506 80.520,250.138 80.400,248.237 80.400 C 246.599 80.400,246.000 80.252,246.000 79.847 C 246.000 79.129,244.753 78.812,241.900 78.805 C 240.203 78.801,239.600 78.654,239.600 78.243 C 239.600 77.458,238.697 77.200,235.953 77.200 C 234.369 77.200,233.218 76.968,232.515 76.507 C 231.736 75.997,230.374 75.775,227.341 75.663 C 224.471 75.556,223.084 75.342,222.763 74.955 C 222.391 74.507,220.233 74.400,211.551 74.400 L 200.800 74.400 200.800 37.200 L 200.800 0.000 198.600 0.000 C 197.390 0.000,196.400 0.180,196.400 0.400 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path3" d="M196.400 0.400 C 196.400 0.620,196.052 0.800,195.627 0.800 C 195.202 0.800,194.740 1.160,194.600 1.600 C 194.460 2.040,194.100 2.400,193.800 2.400 C 193.500 2.400,193.140 2.760,193.000 3.200 C 192.860 3.640,192.488 4.000,192.173 4.000 C 191.858 4.000,191.600 4.360,191.600 4.800 C 191.600 5.452,191.333 5.600,190.163 5.600 C 189.062 5.600,188.676 5.787,188.516 6.400 C 188.400 6.843,187.970 7.200,187.553 7.200 C 187.067 7.200,186.800 7.483,186.800 8.000 C 186.800 8.533,186.533 8.800,186.000 8.800 C 185.560 8.800,185.200 9.049,185.200 9.353 C 185.200 9.658,184.840 10.001,184.400 10.116 C 183.960 10.231,183.600 10.592,183.600 10.918 C 183.600 11.279,183.052 11.614,182.200 11.774 C 181.362 11.931,180.800 12.270,180.800 12.618 C 180.800 12.942,180.429 13.200,179.963 13.200 C 179.462 13.200,179.041 13.521,178.916 14.000 C 178.801 14.440,178.441 14.800,178.116 14.800 C 177.791 14.800,177.431 15.160,177.316 15.600 C 177.201 16.040,176.870 16.400,176.580 16.400 C 176.291 16.400,175.940 16.760,175.800 17.200 C 175.660 17.640,175.213 18.000,174.806 18.000 C 173.639 18.000,172.800 18.436,172.800 19.043 C 172.800 19.349,172.440 19.600,172.000 19.600 C 171.467 19.600,171.200 19.867,171.200 20.400 C 171.200 20.933,170.933 21.200,170.400 21.200 C 169.867 21.200,169.600 21.467,169.600 22.000 C 169.600 22.533,169.333 22.800,168.800 22.800 C 168.267 22.800,168.000 23.067,168.000 23.600 C 168.000 24.242,167.733 24.400,166.647 24.400 C 165.630 24.400,165.241 24.599,165.084 25.200 C 164.959 25.679,164.538 26.000,164.037 26.000 C 163.577 26.000,163.200 26.249,163.200 26.553 C 163.200 26.858,162.840 27.201,162.400 27.316 C 161.960 27.431,161.600 27.791,161.600 28.116 C 161.600 28.441,161.240 28.801,160.800 28.916 C 160.360 29.031,160.000 29.412,160.000 29.763 C 160.000 30.133,159.665 30.400,159.200 30.400 C 158.760 30.400,158.040 30.760,157.600 31.200 C 157.160 31.640,156.530 32.000,156.200 32.000 C 155.867 32.000,155.600 32.356,155.600 32.800 C 155.600 33.333,155.333 33.600,154.800 33.600 C 154.267 33.600,154.000 33.867,154.000 34.400 C 154.000 34.933,153.733 35.200,153.200 35.200 C 152.667 35.200,152.400 35.467,152.400 36.000 C 152.400 36.624,152.133 36.800,151.187 36.800 C 150.452 36.800,149.880 37.048,149.733 37.431 C 149.600 37.777,149.065 38.223,148.545 38.421 C 148.025 38.618,147.600 39.055,147.600 39.390 C 147.600 39.733,147.250 40.000,146.800 40.000 C 146.267 40.000,146.000 40.267,146.000 40.800 C 146.000 41.333,145.733 41.600,145.200 41.600 C 144.760 41.600,144.400 41.856,144.400 42.168 C 144.400 42.481,143.861 42.855,143.202 42.999 C 142.544 43.144,141.869 43.487,141.702 43.761 C 141.536 44.036,141.085 44.376,140.700 44.518 C 140.315 44.659,140.000 45.051,140.000 45.387 C 140.000 45.733,139.652 46.000,139.200 46.000 C 138.667 46.000,138.400 46.267,138.400 46.800 C 138.400 47.333,138.133 47.600,137.600 47.600 C 137.067 47.600,136.800 47.867,136.800 48.400 C 136.800 48.987,136.533 49.200,135.800 49.200 C 135.250 49.200,134.471 49.529,134.069 49.931 C 133.668 50.332,133.038 50.777,132.669 50.918 C 132.301 51.059,132.000 51.451,132.000 51.787 C 132.000 52.133,131.652 52.400,131.200 52.400 C 130.667 52.400,130.400 52.667,130.400 53.200 C 130.400 53.733,130.133 54.000,129.600 54.000 C 129.067 54.000,128.800 54.267,128.800 54.800 C 128.800 55.428,128.533 55.600,127.563 55.600 C 126.662 55.600,126.268 55.817,126.116 56.400 C 126.000 56.843,125.570 57.200,125.153 57.200 C 124.667 57.200,124.400 57.483,124.400 58.000 C 124.400 58.533,124.133 58.800,123.600 58.800 C 123.156 58.800,122.800 59.067,122.800 59.400 C 122.800 59.733,122.444 60.000,122.000 60.000 C 121.482 60.000,121.200 60.267,121.200 60.755 C 121.200 61.304,120.811 61.584,119.779 61.778 C 118.997 61.924,118.258 62.304,118.136 62.622 C 118.014 62.940,117.647 63.200,117.320 63.200 C 116.993 63.200,116.631 63.560,116.516 64.000 C 116.400 64.443,115.970 64.800,115.553 64.800 C 115.067 64.800,114.800 65.083,114.800 65.600 C 114.800 66.133,114.533 66.400,114.000 66.400 C 113.467 66.400,113.200 66.667,113.200 67.200 C 113.200 67.722,112.933 68.000,112.433 68.000 C 111.241 68.000,110.400 68.431,110.400 69.043 C 110.400 69.349,110.040 69.600,109.600 69.600 C 109.067 69.600,108.800 69.867,108.800 70.400 C 108.800 70.933,108.533 71.200,108.000 71.200 C 107.467 71.200,107.200 71.467,107.200 72.000 C 107.200 72.533,106.933 72.800,106.400 72.800 C 105.867 72.800,105.600 73.067,105.600 73.600 C 105.600 74.245,105.333 74.400,104.227 74.400 C 103.205 74.400,102.789 74.605,102.600 75.200 C 102.460 75.640,101.998 76.000,101.573 76.000 C 101.148 76.000,100.800 76.249,100.800 76.553 C 100.800 76.858,100.440 77.201,100.000 77.316 C 99.560 77.431,99.200 77.812,99.200 78.163 C 99.200 78.533,98.865 78.800,98.400 78.800 C 97.882 78.800,97.600 79.067,97.600 79.555 C 97.600 80.102,97.213 80.384,96.200 80.574 C 95.362 80.731,94.800 81.070,94.800 81.418 C 94.800 81.738,94.440 82.000,94.000 82.000 C 93.467 82.000,93.200 82.267,93.200 82.800 C 93.200 83.333,92.933 83.600,92.400 83.600 C 91.867 83.600,91.600 83.867,91.600 84.400 C 91.600 84.933,91.333 85.200,90.800 85.200 C 90.267 85.200,90.000 85.467,90.000 86.000 C 90.000 86.622,89.733 86.800,88.803 86.800 C 88.040 86.800,87.426 87.090,87.107 87.600 C 86.832 88.040,86.291 88.400,85.904 88.400 C 85.467 88.400,85.200 88.703,85.200 89.200 C 85.200 89.733,84.933 90.000,84.400 90.000 C 83.867 90.000,83.600 90.267,83.600 90.800 C 83.600 91.333,83.333 91.600,82.800 91.600 C 82.360 91.600,82.000 91.862,82.000 92.182 C 82.000 92.530,81.438 92.869,80.600 93.026 C 79.798 93.177,79.200 93.526,79.200 93.845 C 79.200 94.150,78.932 94.400,78.603 94.400 C 78.275 94.400,77.782 94.760,77.507 95.200 C 77.232 95.640,76.781 96.000,76.504 96.000 C 76.227 96.000,76.000 96.287,76.000 96.637 C 76.000 96.988,75.640 97.369,75.200 97.484 C 74.003 97.797,74.003 102.203,75.200 102.516 C 75.640 102.631,76.000 103.012,76.000 103.363 C 76.000 103.713,76.230 104.000,76.511 104.000 C 76.792 104.000,77.326 104.315,77.697 104.700 C 79.244 106.305,79.862 106.750,80.903 107.011 C 81.506 107.163,82.000 107.537,82.000 107.843 C 82.000 108.150,82.360 108.400,82.800 108.400 C 83.333 108.400,83.600 108.667,83.600 109.200 C 83.600 109.733,83.867 110.000,84.400 110.000 C 84.933 110.000,85.200 110.267,85.200 110.800 C 85.200 111.297,85.467 111.600,85.904 111.600 C 86.291 111.600,86.832 111.960,87.107 112.400 C 87.426 112.910,88.040 113.200,88.803 113.200 C 89.733 113.200,90.000 113.378,90.000 114.000 C 90.000 114.533,90.267 114.800,90.800 114.800 C 91.333 114.800,91.600 115.067,91.600 115.600 C 91.600 116.133,91.867 116.400,92.400 116.400 C 92.933 116.400,93.200 116.667,93.200 117.200 C 93.200 117.733,93.467 118.000,94.000 118.000 C 94.440 118.000,94.800 118.262,94.800 118.582 C 94.800 118.930,95.362 119.269,96.200 119.426 C 97.213 119.616,97.600 119.898,97.600 120.445 C 97.600 120.918,97.881 121.200,98.353 121.200 C 98.770 121.200,99.200 121.557,99.316 122.000 C 99.431 122.440,99.812 122.800,100.163 122.800 C 100.513 122.800,100.800 123.070,100.800 123.400 C 100.800 123.730,101.154 124.000,101.586 124.000 C 102.018 124.000,102.565 124.360,102.800 124.800 C 103.080 125.324,103.638 125.600,104.414 125.600 C 105.333 125.600,105.600 125.780,105.600 126.400 C 105.600 126.933,105.867 127.200,106.400 127.200 C 106.933 127.200,107.200 127.467,107.200 128.000 C 107.200 128.533,107.467 128.800,108.000 128.800 C 108.533 128.800,108.800 129.067,108.800 129.600 C 108.800 130.133,109.067 130.400,109.600 130.400 C 110.040 130.400,110.400 130.651,110.400 130.957 C 110.400 131.569,111.241 132.000,112.433 132.000 C 112.933 132.000,113.200 132.278,113.200 132.800 C 113.200 133.333,113.467 133.600,114.000 133.600 C 114.533 133.600,114.800 133.867,114.800 134.400 C 114.800 134.917,115.067 135.200,115.553 135.200 C 115.970 135.200,116.400 135.557,116.516 136.000 C 116.631 136.440,116.993 136.800,117.320 136.800 C 117.647 136.800,118.014 137.060,118.136 137.378 C 118.258 137.696,118.997 138.076,119.779 138.222 C 120.811 138.416,121.200 138.696,121.200 139.245 C 121.200 139.733,121.482 140.000,122.000 140.000 C 122.444 140.000,122.800 140.267,122.800 140.600 C 122.800 140.933,123.156 141.200,123.600 141.200 C 124.133 141.200,124.400 141.467,124.400 142.000 C 124.400 142.533,124.667 142.800,125.200 142.800 C 125.640 142.800,126.000 143.051,126.000 143.357 C 126.000 143.969,126.841 144.400,128.033 144.400 C 128.533 144.400,128.800 144.678,128.800 145.200 C 128.800 145.733,129.067 146.000,129.600 146.000 C 130.133 146.000,130.400 146.267,130.400 146.800 C 130.400 147.317,130.667 147.600,131.153 147.600 C 131.570 147.600,132.000 147.957,132.116 148.400 C 132.241 148.879,132.662 149.200,133.163 149.200 C 133.629 149.200,134.000 149.458,134.000 149.782 C 134.000 150.130,134.562 150.469,135.400 150.626 C 136.413 150.816,136.800 151.098,136.800 151.645 C 136.800 152.133,137.082 152.400,137.600 152.400 C 138.133 152.400,138.400 152.667,138.400 153.200 C 138.400 153.733,138.667 154.000,139.200 154.000 C 139.652 154.000,140.000 154.267,140.000 154.613 C 140.000 154.949,140.315 155.341,140.700 155.482 C 141.085 155.624,141.536 155.964,141.702 156.239 C 141.869 156.513,142.544 156.856,143.202 157.001 C 143.861 157.145,144.400 157.519,144.400 157.832 C 144.400 158.144,144.760 158.400,145.200 158.400 C 145.733 158.400,146.000 158.667,146.000 159.200 C 146.000 159.733,146.267 160.000,146.800 160.000 C 147.250 160.000,147.600 160.267,147.600 160.610 C 147.600 160.945,148.025 161.382,148.545 161.579 C 149.065 161.777,149.600 162.223,149.733 162.569 C 149.880 162.952,150.452 163.200,151.187 163.200 C 152.133 163.200,152.400 163.376,152.400 164.000 C 152.400 164.533,152.667 164.800,153.200 164.800 C 153.733 164.800,154.000 165.067,154.000 165.600 C 154.000 166.133,154.267 166.400,154.800 166.400 C 155.333 166.400,155.600 166.667,155.600 167.200 C 155.600 167.718,155.867 168.000,156.357 168.000 C 156.774 168.000,157.212 168.253,157.330 168.562 C 157.449 168.872,158.098 169.246,158.773 169.394 C 159.483 169.550,160.000 169.919,160.000 170.269 C 160.000 170.602,160.360 170.969,160.800 171.084 C 161.240 171.199,161.600 171.559,161.600 171.884 C 161.600 172.209,161.960 172.569,162.400 172.684 C 162.840 172.799,163.200 173.057,163.200 173.257 C 163.200 173.456,163.650 173.791,164.200 174.000 C 164.750 174.209,165.200 174.655,165.200 174.990 C 165.200 175.420,165.612 175.600,166.600 175.600 C 167.733 175.600,168.000 175.752,168.000 176.400 C 168.000 176.933,168.267 177.200,168.800 177.200 C 169.333 177.200,169.600 177.467,169.600 178.000 C 169.600 178.533,169.867 178.800,170.400 178.800 C 170.933 178.800,171.200 179.067,171.200 179.600 C 171.200 180.044,171.467 180.400,171.800 180.400 C 172.130 180.400,172.760 180.760,173.200 181.200 C 173.640 181.640,174.348 182.000,174.773 182.000 C 175.198 182.000,175.660 182.360,175.800 182.800 C 175.940 183.240,176.312 183.600,176.627 183.600 C 176.942 183.600,177.200 183.876,177.200 184.213 C 177.200 184.549,177.515 184.943,177.900 185.086 C 178.285 185.230,178.835 185.674,179.123 186.074 C 179.410 186.473,179.815 186.800,180.023 186.800 C 180.230 186.800,180.760 187.160,181.200 187.600 C 181.640 188.040,182.360 188.400,182.800 188.400 C 183.265 188.400,183.600 188.667,183.600 189.037 C 183.600 189.388,183.960 189.769,184.400 189.884 C 184.840 189.999,185.200 190.342,185.200 190.647 C 185.200 190.951,185.560 191.200,186.000 191.200 C 186.533 191.200,186.800 191.467,186.800 192.000 C 186.800 192.497,187.067 192.800,187.504 192.800 C 187.891 192.800,188.432 193.160,188.707 193.600 C 189.026 194.110,189.640 194.400,190.403 194.400 C 191.333 194.400,191.600 194.578,191.600 195.200 C 191.600 195.640,191.858 196.000,192.173 196.000 C 192.488 196.000,192.860 196.360,193.000 196.800 C 193.140 197.240,193.500 197.600,193.800 197.600 C 194.100 197.600,194.460 197.960,194.600 198.400 C 194.740 198.840,195.202 199.200,195.627 199.200 C 196.052 199.200,196.400 199.451,196.400 199.757 C 196.400 200.477,197.278 200.800,199.233 200.800 L 200.800 200.800 200.800 163.900 L 200.799 127.000 209.400 127.115 C 217.639 127.225,218.000 127.263,218.000 128.015 C 218.000 128.743,218.292 128.800,222.000 128.800 C 225.733 128.800,226.000 128.853,226.000 129.600 C 226.000 130.302,226.267 130.400,228.186 130.400 C 229.962 130.400,230.452 130.550,230.800 131.200 C 231.135 131.827,231.638 132.000,233.118 132.000 C 234.574 132.000,235.122 132.183,235.507 132.800 C 235.898 133.426,236.440 133.600,238.003 133.600 C 239.733 133.600,240.000 133.707,240.000 134.400 C 240.000 135.067,240.267 135.200,241.600 135.200 C 242.667 135.200,243.467 135.467,244.000 136.000 C 244.485 136.485,245.333 136.800,246.153 136.800 C 247.170 136.800,247.559 136.999,247.716 137.600 C 247.875 138.206,248.262 138.400,249.316 138.400 C 250.370 138.400,250.757 138.594,250.916 139.200 C 251.031 139.640,251.457 140.006,251.863 140.013 C 252.268 140.020,252.949 140.290,253.376 140.613 C 253.804 140.936,254.479 141.200,254.876 141.200 C 255.333 141.200,255.600 141.495,255.600 142.000 C 255.600 142.667,255.867 142.800,257.200 142.800 C 258.533 142.800,258.800 142.933,258.800 143.600 C 258.800 144.117,259.067 144.400,259.553 144.400 C 259.970 144.400,260.400 144.757,260.516 145.200 C 260.668 145.783,261.062 146.000,261.963 146.000 C 262.933 146.000,263.200 146.172,263.200 146.800 C 263.200 147.317,263.467 147.600,263.953 147.600 C 264.370 147.600,264.800 147.957,264.916 148.400 C 265.076 149.013,265.462 149.200,266.563 149.200 C 267.733 149.200,268.000 149.348,268.000 150.000 C 268.000 150.533,268.267 150.800,268.800 150.800 C 269.333 150.800,269.600 151.067,269.600 151.600 C 269.600 152.133,269.867 152.400,270.400 152.400 C 270.865 152.400,271.200 152.667,271.200 153.037 C 271.200 153.388,271.560 153.769,272.000 153.884 C 272.440 153.999,272.800 154.330,272.800 154.620 C 272.800 154.909,273.160 155.260,273.600 155.400 C 274.040 155.540,274.400 155.912,274.400 156.227 C 274.400 156.542,274.760 156.800,275.200 156.800 C 275.665 156.800,276.000 157.067,276.000 157.437 C 276.000 157.788,276.360 158.169,276.800 158.284 C 277.240 158.399,277.600 158.736,277.600 159.033 C 277.600 159.329,277.960 159.765,278.400 160.000 C 278.840 160.235,279.200 160.692,279.200 161.014 C 279.200 161.336,279.458 161.600,279.773 161.600 C 280.088 161.600,280.460 161.960,280.600 162.400 C 280.740 162.840,281.112 163.200,281.427 163.200 C 281.742 163.200,282.000 163.487,282.000 163.837 C 282.000 164.188,282.360 164.569,282.800 164.684 C 283.243 164.800,283.600 165.230,283.600 165.647 C 283.600 166.133,283.883 166.400,284.400 166.400 C 284.933 166.400,285.200 166.667,285.200 167.200 C 285.200 167.733,285.467 168.000,286.000 168.000 C 286.497 168.000,286.800 168.267,286.800 168.704 C 286.800 169.091,287.160 169.632,287.600 169.907 C 288.040 170.182,288.400 170.834,288.400 171.357 C 288.400 171.970,288.683 172.381,289.200 172.516 C 289.640 172.631,290.000 173.000,290.000 173.336 C 290.000 173.671,290.360 174.060,290.800 174.200 C 291.240 174.340,291.600 174.789,291.600 175.199 C 291.600 176.135,293.247 178.760,293.849 178.783 C 294.096 178.792,294.413 179.520,294.554 180.400 C 294.719 181.435,295.020 182.000,295.405 182.000 C 295.733 182.000,296.000 182.358,296.000 182.800 C 296.000 183.240,296.360 183.960,296.800 184.400 C 297.240 184.840,297.600 185.560,297.600 186.000 C 297.600 186.533,297.867 186.800,298.400 186.800 C 299.052 186.800,299.200 187.067,299.200 188.237 C 299.200 189.308,299.392 189.725,299.952 189.872 C 300.506 190.016,300.758 190.549,300.909 191.894 C 301.032 192.985,301.374 193.866,301.758 194.080 C 302.178 194.316,302.400 194.985,302.400 196.020 C 302.400 197.333,302.535 197.600,303.200 197.600 C 303.893 197.600,304.000 197.867,304.000 199.586 C 304.000 201.162,304.165 201.660,304.800 202.000 C 305.438 202.342,305.600 202.838,305.600 204.452 C 305.600 206.138,305.733 206.510,306.400 206.684 C 307.084 206.863,307.200 207.230,307.200 209.213 C 307.200 210.538,307.388 211.596,307.638 211.679 C 308.190 211.863,308.760 214.760,308.783 217.500 C 308.795 218.991,308.957 219.600,309.342 219.600 C 309.775 219.600,309.926 221.386,310.096 228.500 C 310.395 241.007,310.020 255.600,309.400 255.600 C 309.081 255.600,308.836 256.776,308.672 259.096 C 308.499 261.553,308.243 262.725,307.813 263.040 C 307.390 263.349,307.200 264.175,307.200 265.697 C 307.200 267.570,307.078 267.939,306.400 268.116 C 305.723 268.293,305.600 268.662,305.600 270.516 C 305.600 272.370,305.477 272.739,304.800 272.916 C 304.134 273.090,304.000 273.462,304.000 275.136 C 304.000 276.795,303.860 277.190,303.200 277.400 C 302.579 277.597,302.400 278.005,302.400 279.227 C 302.400 280.300,302.224 280.800,301.847 280.800 C 301.216 280.800,300.813 282.000,300.805 283.900 C 300.801 284.932,300.635 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.935 288.400,297.600 288.667,297.600 289.037 C 297.600 289.387,297.240 290.131,296.800 290.691 C 296.360 291.250,296.000 292.044,296.000 292.454 C 296.000 292.864,295.749 293.200,295.443 293.200 C 294.831 293.200,294.400 294.041,294.400 295.233 C 294.400 295.655,294.133 296.000,293.808 296.000 C 293.482 296.000,293.102 296.450,292.964 297.000 C 292.826 297.550,292.463 298.000,292.157 298.000 C 291.787 298.000,291.600 298.471,291.600 299.400 C 291.600 300.533,291.448 300.800,290.800 300.800 C 290.267 300.800,290.000 301.067,290.000 301.600 C 290.000 302.133,289.733 302.400,289.200 302.400 C 288.578 302.400,288.400 302.667,288.400 303.597 C 288.400 304.360,288.110 304.974,287.600 305.293 C 287.160 305.568,286.800 306.109,286.800 306.496 C 286.800 306.933,286.497 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.935 308.800,283.600 309.067,283.600 309.437 C 283.600 309.788,283.240 310.169,282.800 310.284 C 282.360 310.399,282.000 310.676,282.000 310.899 C 282.000 311.123,281.370 311.900,280.600 312.626 C 279.830 313.352,279.200 314.126,279.200 314.346 C 279.200 314.566,278.840 314.860,278.400 315.000 C 277.960 315.140,277.600 315.491,277.600 315.780 C 277.600 316.070,277.240 316.401,276.800 316.516 C 276.360 316.631,276.000 316.991,276.000 317.316 C 276.000 317.641,275.640 318.001,275.200 318.116 C 274.760 318.231,274.400 318.612,274.400 318.963 C 274.400 319.333,274.065 319.600,273.600 319.600 C 273.067 319.600,272.800 319.867,272.800 320.400 C 272.800 320.933,272.533 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.118,269.333 324.400,268.843 324.400 C 268.426 324.400,267.988 324.653,267.870 324.962 C 267.751 325.272,267.103 325.646,266.429 325.794 C 265.756 325.941,265.069 326.287,264.902 326.561 C 264.736 326.836,264.285 327.176,263.900 327.318 C 263.515 327.459,263.200 327.831,263.200 328.143 C 263.200 328.475,262.619 328.820,261.800 328.974 C 260.962 329.131,260.400 329.470,260.400 329.818 C 260.400 330.138,260.040 330.400,259.600 330.400 C 259.067 330.400,258.800 330.667,258.800 331.200 C 258.800 331.852,258.533 332.000,257.363 332.000 C 256.262 332.000,255.876 332.187,255.716 332.800 C 255.600 333.243,255.170 333.600,254.753 333.600 C 254.339 333.600,253.640 333.960,253.200 334.400 C 252.760 334.840,252.083 335.200,251.696 335.200 C 251.309 335.200,250.768 335.560,250.493 336.000 C 250.174 336.510,249.560 336.800,248.797 336.800 C 247.867 336.800,247.600 336.978,247.600 337.600 C 247.600 338.261,247.333 338.400,246.062 338.400 C 245.032 338.400,244.285 338.664,243.800 339.200 C 243.315 339.736,242.568 340.000,241.538 340.000 C 240.267 340.000,240.000 340.139,240.000 340.800 C 240.000 341.502,239.733 341.600,237.820 341.600 C 236.415 341.600,235.526 341.792,235.320 342.140 C 235.144 342.436,234.106 342.798,233.014 342.944 C 231.903 343.092,230.880 343.471,230.694 343.804 C 230.465 344.213,229.706 344.400,228.276 344.400 C 226.626 344.400,226.089 344.566,225.693 345.200 C 225.256 345.899,224.760 346.000,221.759 346.000 C 218.662 346.000,218.305 346.078,218.116 346.800 C 217.916 347.566,217.570 347.600,209.986 347.600 C 201.767 347.600,200.800 347.710,200.800 348.643 C 200.800 348.949,200.440 349.200,200.000 349.200 C 199.560 349.200,199.200 348.949,199.200 348.643 C 199.200 347.710,198.233 347.600,190.014 347.600 C 182.430 347.600,182.084 347.566,181.884 346.800 C 181.695 346.078,181.338 346.000,178.241 346.000 C 175.240 346.000,174.744 345.899,174.307 345.200 C 173.911 344.566,173.374 344.400,171.724 344.400 C 170.294 344.400,169.535 344.213,169.306 343.804 C 169.120 343.471,168.097 343.092,166.986 342.944 C 165.894 342.798,164.856 342.436,164.680 342.140 C 164.474 341.792,163.585 341.600,162.180 341.600 C 160.267 341.600,160.000 341.502,160.000 340.800 C 160.000 340.137,159.733 340.000,158.447 340.000 C 157.230 340.000,156.848 339.827,156.684 339.200 C 156.509 338.532,156.138 338.400,154.437 338.400 C 152.667 338.400,152.400 338.295,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.467,148.933 335.200,148.400 335.200 C 147.960 335.200,147.240 334.840,146.800 334.400 C 146.360 333.960,145.661 333.600,145.247 333.600 C 144.830 333.600,144.400 333.243,144.284 332.800 C 144.124 332.187,143.738 332.000,142.637 332.000 C 141.467 332.000,141.200 331.852,141.200 331.200 C 141.200 330.756,140.933 330.400,140.600 330.400 C 140.270 330.400,139.640 330.040,139.200 329.600 C 138.760 329.160,138.040 328.800,137.600 328.800 C 137.135 328.800,136.800 328.533,136.800 328.163 C 136.800 327.812,136.440 327.431,136.000 327.316 C 135.560 327.201,135.200 326.942,135.200 326.741 C 135.200 326.540,134.885 326.260,134.500 326.119 C 134.115 325.979,133.371 325.534,132.846 325.132 C 132.321 324.729,131.556 324.400,131.146 324.400 C 130.667 324.400,130.400 324.114,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.867 319.600,125.600 319.333,125.600 318.800 C 125.600 318.267,125.333 318.000,124.800 318.000 C 124.335 318.000,124.000 317.733,124.000 317.363 C 124.000 317.012,123.640 316.631,123.200 316.516 C 122.760 316.401,122.400 316.058,122.400 315.753 C 122.400 315.449,122.124 315.200,121.787 315.200 C 121.451 315.200,121.055 314.885,120.908 314.500 C 120.761 314.115,120.046 313.239,119.320 312.553 C 118.594 311.867,118.000 311.123,118.000 310.899 C 118.000 310.676,117.640 310.399,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.503 307.200,113.200 306.933,113.200 306.496 C 113.200 306.109,112.840 305.568,112.400 305.293 C 111.935 305.003,111.600 304.360,111.600 303.759 C 111.600 303.062,111.340 302.657,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.552 300.800,108.400 300.533,108.400 299.400 C 108.400 298.471,108.213 298.000,107.843 298.000 C 107.537 298.000,107.174 297.550,107.036 297.000 C 106.898 296.450,106.518 296.000,106.192 296.000 C 105.867 296.000,105.600 295.655,105.600 295.233 C 105.600 294.041,105.169 293.200,104.557 293.200 C 104.251 293.200,104.000 292.864,104.000 292.454 C 104.000 292.044,103.640 291.250,103.200 290.691 C 102.760 290.131,102.400 289.431,102.400 289.133 C 102.400 288.836,102.040 288.368,101.600 288.093 C 101.090 287.774,100.800 287.160,100.800 286.397 C 100.800 285.467,100.622 285.200,100.000 285.200 C 99.365 285.200,99.199 284.932,99.195 283.900 C 99.187 282.000,98.784 280.800,98.153 280.800 C 97.776 280.800,97.600 280.300,97.600 279.227 C 97.600 278.005,97.421 277.597,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.527 272.740,94.400 272.370,94.400 270.580 C 94.400 268.805,94.268 268.412,93.600 268.200 C 92.926 267.986,92.800 267.595,92.800 265.717 C 92.800 264.177,92.611 263.350,92.187 263.040 C 91.757 262.725,91.501 261.553,91.328 259.096 C 91.164 256.771,90.920 255.600,90.599 255.600 C 90.243 255.600,90.061 253.269,89.905 246.729 C 89.716 238.778,89.619 237.803,88.970 237.329 C 88.388 236.903,83.221 236.800,62.524 236.800 L 36.800 236.800 36.800 248.304 C 36.800 259.374,36.830 259.826,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.528 277.200,41.600 277.467,41.600 280.180 C 41.600 282.268,41.763 283.256,42.143 283.480 C 42.442 283.656,42.784 284.689,42.903 285.776 C 43.028 286.917,43.389 287.949,43.759 288.220 C 44.191 288.535,44.400 289.307,44.400 290.582 C 44.400 292.138,44.542 292.512,45.200 292.684 C 45.813 292.845,46.001 293.232,46.005 294.347 C 46.013 296.391,46.400 297.600,47.047 297.600 C 47.426 297.600,47.600 298.104,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.067 300.800,49.200 301.067,49.200 302.400 C 49.200 303.467,49.467 304.267,50.000 304.800 C 50.455 305.255,50.800 306.133,50.800 306.837 C 50.800 307.738,51.017 308.132,51.600 308.284 C 52.206 308.443,52.400 308.830,52.400 309.884 C 52.400 310.938,52.594 311.325,53.200 311.484 C 53.806 311.643,54.000 312.030,54.000 313.084 C 54.000 314.138,54.194 314.525,54.800 314.684 C 55.364 314.832,55.600 315.230,55.600 316.033 C 55.600 316.762,55.887 317.326,56.400 317.600 C 56.840 317.835,57.200 318.361,57.200 318.767 C 57.200 319.174,57.560 319.601,58.000 319.716 C 58.585 319.869,58.800 320.262,58.800 321.175 C 58.800 321.907,59.044 322.519,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 62.979 327.200,63.200 327.467,63.200 328.167 C 63.200 329.548,63.598 330.400,64.243 330.400 C 64.549 330.400,64.800 330.760,64.800 331.200 C 64.800 331.718,65.067 332.000,65.555 332.000 C 66.102 332.000,66.384 332.387,66.574 333.400 C 66.731 334.238,67.070 334.800,67.418 334.800 C 67.742 334.800,68.000 335.171,68.000 335.637 C 68.000 336.138,68.321 336.559,68.800 336.684 C 69.243 336.800,69.600 337.230,69.600 337.647 C 69.600 338.133,69.883 338.400,70.400 338.400 C 70.924 338.400,71.200 338.667,71.200 339.173 C 71.200 339.598,71.560 340.060,72.000 340.200 C 72.560 340.378,72.800 340.805,72.800 341.627 C 72.800 342.533,72.982 342.800,73.600 342.800 C 74.117 342.800,74.400 343.067,74.400 343.553 C 74.400 343.970,74.757 344.400,75.200 344.516 C 75.640 344.631,76.000 345.012,76.000 345.363 C 76.000 345.713,76.270 346.000,76.600 346.000 C 76.930 346.000,77.200 346.287,77.200 346.637 C 77.200 346.988,77.560 347.369,78.000 347.484 C 78.443 347.600,78.800 348.030,78.800 348.447 C 78.800 348.933,79.083 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.333 360.000,91.600 360.267,91.600 360.800 C 91.600 361.333,91.867 361.600,92.400 361.600 C 92.917 361.600,93.200 361.867,93.200 362.353 C 93.200 362.770,93.557 363.200,94.000 363.316 C 94.440 363.431,94.800 363.812,94.800 364.163 C 94.800 364.575,95.151 364.800,95.797 364.800 C 96.360 364.800,97.010 365.148,97.293 365.600 C 97.568 366.040,98.109 366.400,98.496 366.400 C 98.933 366.400,99.200 366.703,99.200 367.200 C 99.200 367.733,99.467 368.000,100.000 368.000 C 100.450 368.000,100.800 368.267,100.800 368.610 C 100.800 368.945,101.250 369.391,101.800 369.600 C 102.350 369.809,102.800 370.156,102.800 370.372 C 102.800 370.587,103.430 370.882,104.200 371.026 C 105.052 371.186,105.600 371.521,105.600 371.882 C 105.600 372.208,105.960 372.569,106.400 372.684 C 106.840 372.799,107.200 373.122,107.200 373.402 C 107.200 373.682,107.813 374.026,108.561 374.166 C 109.310 374.307,110.024 374.687,110.149 375.011 C 110.273 375.335,110.741 375.600,111.187 375.600 C 111.733 375.600,112.000 375.863,112.000 376.400 C 112.000 377.048,112.267 377.200,113.400 377.200 C 114.533 377.200,114.800 377.352,114.800 378.000 C 114.800 378.667,115.067 378.800,116.400 378.800 C 117.733 378.800,118.000 378.933,118.000 379.600 C 118.000 380.097,118.267 380.400,118.704 380.400 C 119.091 380.400,119.632 380.760,119.907 381.200 C 120.219 381.699,120.840 382.000,121.557 382.000 C 122.370 382.000,122.768 382.234,122.916 382.800 C 123.075 383.406,123.462 383.600,124.516 383.600 C 125.570 383.600,125.957 383.794,126.116 384.400 C 126.276 385.013,126.662 385.200,127.763 385.200 C 128.754 385.200,129.200 385.381,129.200 385.782 C 129.200 386.134,129.774 386.471,130.655 386.637 C 131.455 386.787,132.445 387.245,132.855 387.655 C 133.333 388.133,134.173 388.400,135.200 388.400 C 136.301 388.400,136.800 388.574,136.800 388.957 C 136.800 389.602,137.652 390.000,139.033 390.000 C 139.626 390.000,140.000 390.232,140.000 390.600 C 140.000 391.044,140.467 391.200,141.800 391.200 C 143.067 391.200,143.837 391.437,144.400 392.000 C 144.987 392.587,145.733 392.800,147.200 392.800 C 148.933 392.800,149.200 392.907,149.200 393.600 C 149.200 394.309,149.467 394.400,151.553 394.400 C 153.570 394.400,153.937 394.514,154.116 395.200 C 154.302 395.911,154.662 396.000,157.363 396.000 C 160.133 396.000,160.400 396.070,160.400 396.800 C 160.400 397.537,160.667 397.600,163.797 397.600 C 166.760 397.600,167.257 397.702,167.693 398.400 C 168.144 399.123,168.626 399.200,172.696 399.200 C 175.432 399.200,177.200 399.357,177.200 399.600 C 177.200 399.862,185.067 400.000,200.000 400.000 C 214.933 400.000,222.800 399.862,222.800 399.600 C 222.800 399.357,224.568 399.200,227.304 399.200 C 231.374 399.200,231.856 399.123,232.307 398.400 C 232.743 397.702,233.240 397.600,236.203 397.600 C 239.333 397.600,239.600 397.537,239.600 396.800 C 239.600 396.070,239.867 396.000,242.637 396.000 C 245.338 396.000,245.698 395.911,245.884 395.200 C 246.063 394.514,246.430 394.400,248.447 394.400 C 250.533 394.400,250.800 394.309,250.800 393.600 C 250.800 392.901,251.067 392.800,252.911 392.800 C 254.527 392.800,255.183 392.612,255.707 392.000 C 256.204 391.420,256.887 391.200,258.196 391.200 C 259.533 391.200,260.000 391.045,260.000 390.600 C 260.000 390.178,260.426 390.000,261.437 390.000 C 262.538 390.000,262.924 389.813,263.084 389.200 C 263.248 388.573,263.630 388.400,264.847 388.400 C 265.867 388.400,266.675 388.125,267.200 387.600 C 267.640 387.160,268.452 386.800,269.004 386.800 C 269.556 386.800,270.316 386.440,270.693 386.000 C 271.083 385.545,271.873 385.200,272.526 385.200 C 273.338 385.200,273.736 384.966,273.884 384.400 C 274.043 383.794,274.430 383.600,275.484 383.600 C 276.538 383.600,276.925 383.406,277.084 382.800 C 277.232 382.234,277.630 382.000,278.443 382.000 C 279.160 382.000,279.781 381.699,280.093 381.200 C 280.368 380.760,280.909 380.400,281.296 380.400 C 281.733 380.400,282.000 380.097,282.000 379.600 C 282.000 378.933,282.267 378.800,283.600 378.800 C 284.933 378.800,285.200 378.667,285.200 378.000 C 285.200 377.352,285.467 377.200,286.600 377.200 C 287.733 377.200,288.000 377.048,288.000 376.400 C 288.000 375.863,288.267 375.600,288.813 375.600 C 289.259 375.600,289.727 375.335,289.851 375.011 C 289.976 374.687,290.690 374.307,291.439 374.166 C 292.187 374.026,292.800 373.682,292.800 373.402 C 292.800 373.122,293.160 372.799,293.600 372.684 C 294.040 372.569,294.400 372.208,294.400 371.882 C 294.400 371.521,294.948 371.186,295.800 371.026 C 296.570 370.882,297.200 370.587,297.200 370.372 C 297.200 370.156,297.650 369.809,298.200 369.600 C 298.750 369.391,299.200 368.945,299.200 368.610 C 299.200 368.267,299.550 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.689,301.067 366.400,301.538 366.400 C 301.944 366.400,302.602 366.040,303.000 365.600 C 303.398 365.160,304.056 364.800,304.462 364.800 C 304.871 364.800,305.200 364.515,305.200 364.163 C 305.200 363.812,305.560 363.431,306.000 363.316 C 306.440 363.201,306.800 362.841,306.800 362.516 C 306.800 362.191,307.160 361.831,307.600 361.716 C 308.043 361.600,308.400 361.170,308.400 360.753 C 308.400 360.267,308.683 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.151,311.600 357.847 C 311.600 357.542,311.960 357.199,312.400 357.084 C 312.840 356.969,313.200 356.588,313.200 356.237 C 313.200 355.867,313.535 355.600,314.000 355.600 C 314.533 355.600,314.800 355.333,314.800 354.800 C 314.800 354.267,315.067 354.000,315.600 354.000 C 316.133 354.000,316.400 353.733,316.400 353.200 C 316.400 352.667,316.667 352.400,317.200 352.400 C 317.733 352.400,318.000 352.133,318.000 351.600 C 318.000 351.067,318.267 350.800,318.800 350.800 C 319.333 350.800,319.600 350.533,319.600 350.000 C 319.600 349.467,319.867 349.200,320.400 349.200 C 320.917 349.200,321.200 348.933,321.200 348.447 C 321.200 348.030,321.557 347.600,322.000 347.484 C 322.440 347.369,322.800 346.988,322.800 346.637 C 322.800 346.287,323.070 346.000,323.400 346.000 C 323.730 346.000,324.000 345.713,324.000 345.363 C 324.000 345.012,324.360 344.631,324.800 344.516 C 325.243 344.400,325.600 343.970,325.600 343.553 C 325.600 343.067,325.883 342.800,326.400 342.800 C 327.018 342.800,327.200 342.533,327.200 341.627 C 327.200 340.805,327.440 340.378,328.000 340.200 C 328.440 340.060,328.800 339.598,328.800 339.173 C 328.800 338.667,329.076 338.400,329.600 338.400 C 330.117 338.400,330.400 338.133,330.400 337.647 C 330.400 337.230,330.757 336.800,331.200 336.684 C 331.679 336.559,332.000 336.138,332.000 335.637 C 332.000 335.171,332.258 334.800,332.582 334.800 C 332.930 334.800,333.269 334.238,333.426 333.400 C 333.616 332.387,333.898 332.000,334.445 332.000 C 334.933 332.000,335.200 331.718,335.200 331.200 C 335.200 330.760,335.451 330.400,335.757 330.400 C 336.402 330.400,336.800 329.548,336.800 328.167 C 336.800 327.467,337.021 327.200,337.600 327.200 C 338.133 327.200,338.400 326.933,338.400 326.400 C 338.400 325.960,338.650 325.600,338.955 325.600 C 339.271 325.600,339.621 325.011,339.766 324.239 C 339.907 323.490,340.287 322.776,340.611 322.651 C 340.956 322.519,341.200 321.907,341.200 321.175 C 341.200 320.262,341.415 319.869,342.000 319.716 C 342.440 319.601,342.800 319.174,342.800 318.767 C 342.800 318.361,343.160 317.835,343.600 317.600 C 344.113 317.326,344.400 316.762,344.400 316.033 C 344.400 315.230,344.636 314.832,345.200 314.684 C 345.806 314.525,346.000 314.138,346.000 313.084 C 346.000 312.030,346.194 311.643,346.800 311.484 C 347.406 311.325,347.600 310.938,347.600 309.884 C 347.600 308.830,347.794 308.443,348.400 308.284 C 348.983 308.132,349.200 307.738,349.200 306.837 C 349.200 306.133,349.545 305.255,350.000 304.800 C 350.533 304.267,350.800 303.467,350.800 302.400 C 350.800 301.067,350.933 300.800,351.600 300.800 C 352.248 300.800,352.400 300.533,352.400 299.400 C 352.400 298.533,352.705 297.695,353.200 297.200 C 353.757 296.643,354.000 295.867,354.000 294.647 C 354.000 293.230,354.153 292.853,354.800 292.684 C 355.458 292.512,355.600 292.138,355.600 290.582 C 355.600 289.307,355.809 288.535,356.241 288.220 C 356.611 287.949,356.972 286.917,357.097 285.776 C 357.216 284.689,357.558 283.656,357.857 283.480 C 358.237 283.256,358.400 282.268,358.400 280.180 C 358.400 277.467,358.472 277.200,359.200 277.200 C 359.937 277.200,360.000 276.933,360.000 273.803 C 360.000 270.840,360.102 270.343,360.800 269.907 C 361.519 269.458,361.600 268.974,361.600 265.107 C 361.600 261.240,361.681 260.756,362.400 260.307 C 363.185 259.817,363.200 259.374,363.200 237.400 C 363.200 215.426,363.185 214.983,362.400 214.493 C 361.685 214.046,361.600 213.560,361.600 209.893 C 361.600 206.226,361.515 205.740,360.800 205.293 C 360.101 204.856,360.000 204.360,360.000 201.359 C 360.000 198.262,359.922 197.905,359.200 197.716 C 358.491 197.531,358.400 197.170,358.400 194.553 C 358.400 192.195,358.279 191.600,357.800 191.600 C 357.374 191.600,357.198 191.164,357.195 190.100 C 357.187 188.011,356.805 186.800,356.153 186.800 C 355.766 186.800,355.600 186.271,355.600 185.033 C 355.600 182.886,355.296 182.000,354.557 182.000 C 354.196 182.000,353.998 181.542,353.995 180.700 C 353.987 178.800,353.584 177.600,352.953 177.600 C 352.574 177.600,352.400 177.096,352.400 176.000 C 352.400 174.703,352.258 174.400,351.651 174.400 C 351.042 174.400,350.865 174.017,350.704 172.346 C 350.577 171.017,350.276 170.162,349.854 169.926 C 349.441 169.695,349.200 169.038,349.200 168.143 C 349.200 167.062,349.010 166.675,348.400 166.516 C 347.803 166.360,347.600 165.970,347.600 164.980 C 347.600 164.005,347.388 163.587,346.800 163.400 C 346.205 163.211,346.000 162.795,346.000 161.773 C 346.000 160.667,345.845 160.400,345.200 160.400 C 344.548 160.400,344.400 160.133,344.400 158.963 C 344.400 157.862,344.213 157.476,343.600 157.316 C 343.157 157.200,342.800 156.770,342.800 156.353 C 342.800 155.939,342.549 155.600,342.243 155.600 C 341.598 155.600,341.200 154.748,341.200 153.367 C 341.200 152.809,340.965 152.400,340.645 152.400 C 340.327 152.400,339.977 151.804,339.828 151.011 C 339.685 150.247,339.336 149.482,339.054 149.311 C 338.771 149.140,338.424 148.685,338.282 148.300 C 338.141 147.915,337.749 147.600,337.413 147.600 C 337.000 147.600,336.800 147.212,336.800 146.414 C 336.800 145.638,336.524 145.080,336.000 144.800 C 335.560 144.565,335.200 144.120,335.200 143.813 C 335.200 143.505,334.853 143.144,334.428 143.009 C 333.989 142.870,333.541 142.242,333.390 141.555 C 333.244 140.890,332.872 140.249,332.562 140.130 C 332.253 140.012,332.000 139.574,332.000 139.157 C 332.000 138.667,331.718 138.400,331.200 138.400 C 330.667 138.400,330.400 138.133,330.400 137.600 C 330.400 137.067,330.133 136.800,329.600 136.800 C 329.067 136.800,328.800 136.533,328.800 136.000 C 328.800 135.560,328.440 134.840,328.000 134.400 C 327.560 133.960,327.200 133.313,327.200 132.963 C 327.200 132.612,326.840 132.231,326.400 132.116 C 325.957 132.000,325.600 131.570,325.600 131.153 C 325.600 130.667,325.317 130.400,324.800 130.400 C 324.267 130.400,324.000 130.133,324.000 129.600 C 324.000 129.160,323.751 128.800,323.447 128.800 C 323.142 128.800,322.799 128.440,322.684 128.000 C 322.569 127.560,322.188 127.200,321.837 127.200 C 321.487 127.200,321.200 126.942,321.200 126.627 C 321.200 126.312,320.840 125.940,320.400 125.800 C 319.960 125.660,319.600 125.288,319.600 124.973 C 319.600 124.658,319.240 124.400,318.800 124.400 C 318.267 124.400,318.000 124.133,318.000 123.600 C 318.000 123.067,317.733 122.800,317.200 122.800 C 316.667 122.800,316.400 122.533,316.400 122.000 C 316.400 121.467,316.133 121.200,315.600 121.200 C 315.067 121.200,314.800 120.933,314.800 120.400 C 314.800 119.867,314.533 119.600,314.000 119.600 C 313.467 119.600,313.200 119.333,313.200 118.800 C 313.200 118.267,312.933 118.000,312.400 118.000 C 311.867 118.000,311.600 117.733,311.600 117.200 C 311.600 116.667,311.333 116.400,310.800 116.400 C 310.267 116.400,310.000 116.133,310.000 115.600 C 310.000 115.067,309.733 114.800,309.200 114.800 C 308.667 114.800,308.400 114.533,308.400 114.000 C 308.400 113.467,308.133 113.200,307.600 113.200 C 307.160 113.200,306.800 112.996,306.800 112.746 C 306.800 112.302,304.970 110.400,304.542 110.400 C 304.424 110.400,303.869 110.040,303.309 109.600 C 302.750 109.160,301.956 108.800,301.546 108.800 C 301.067 108.800,300.800 108.514,300.800 108.000 C 300.800 107.467,300.533 107.200,300.000 107.200 C 299.467 107.200,299.200 106.933,299.200 106.400 C 299.200 105.903,298.933 105.600,298.496 105.600 C 298.109 105.600,297.568 105.240,297.293 104.800 C 296.974 104.290,296.360 104.000,295.597 104.000 C 294.667 104.000,294.400 103.822,294.400 103.200 C 294.400 102.683,294.133 102.400,293.647 102.400 C 293.230 102.400,292.800 102.043,292.684 101.600 C 292.534 101.026,292.138 100.800,291.284 100.800 C 290.430 100.800,290.034 100.574,289.884 100.000 C 289.759 99.521,289.338 99.200,288.837 99.200 C 288.377 99.200,288.000 98.949,288.000 98.643 C 288.000 98.040,287.162 97.600,286.014 97.600 C 285.618 97.600,285.199 97.240,285.084 96.800 C 284.924 96.187,284.538 96.000,283.437 96.000 C 282.267 96.000,282.000 95.852,282.000 95.200 C 282.000 94.682,281.733 94.400,281.243 94.400 C 280.826 94.400,280.386 94.140,280.264 93.822 C 280.142 93.504,279.403 93.124,278.621 92.978 C 277.803 92.824,277.200 92.475,277.200 92.155 C 277.200 91.774,276.699 91.600,275.600 91.600 C 274.267 91.600,274.000 91.467,274.000 90.800 C 274.000 90.155,273.733 90.000,272.627 90.000 C 271.605 90.000,271.189 89.795,271.000 89.200 C 270.811 88.605,270.395 88.400,269.373 88.400 C 268.533 88.400,267.689 88.089,267.200 87.600 C 266.667 87.067,265.867 86.800,264.800 86.800 C 263.467 86.800,263.200 86.667,263.200 86.000 C 263.200 85.337,262.933 85.200,261.647 85.200 C 260.430 85.200,260.048 85.027,259.884 84.400 C 259.710 83.735,259.338 83.600,257.684 83.600 C 256.030 83.600,255.658 83.465,255.484 82.800 C 255.307 82.123,254.938 82.000,253.084 82.000 C 251.230 82.000,250.861 81.877,250.684 81.200 C 250.506 80.520,250.138 80.400,248.237 80.400 C 246.599 80.400,246.000 80.252,246.000 79.847 C 246.000 79.129,244.753 78.812,241.900 78.805 C 240.203 78.801,239.600 78.654,239.600 78.243 C 239.600 77.458,238.697 77.200,235.953 77.200 C 234.369 77.200,233.218 76.968,232.515 76.507 C 231.736 75.997,230.374 75.775,227.341 75.663 C 224.471 75.556,223.084 75.342,222.763 74.955 C 222.391 74.507,220.233 74.400,211.551 74.400 L 200.800 74.400 200.800 37.200 L 200.800 0.000 198.600 0.000 C 197.390 0.000,196.400 0.180,196.400 0.400 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path4" d="M196.400 0.400 C 196.400 0.620,196.052 0.800,195.627 0.800 C 195.202 0.800,194.740 1.160,194.600 1.600 C 194.460 2.040,194.100 2.400,193.800 2.400 C 193.500 2.400,193.140 2.760,193.000 3.200 C 192.860 3.640,192.488 4.000,192.173 4.000 C 191.858 4.000,191.600 4.360,191.600 4.800 C 191.600 5.452,191.333 5.600,190.163 5.600 C 189.062 5.600,188.676 5.787,188.516 6.400 C 188.400 6.843,187.970 7.200,187.553 7.200 C 187.067 7.200,186.800 7.483,186.800 8.000 C 186.800 8.533,186.533 8.800,186.000 8.800 C 185.560 8.800,185.200 9.049,185.200 9.353 C 185.200 9.658,184.840 10.001,184.400 10.116 C 183.960 10.231,183.600 10.592,183.600 10.918 C 183.600 11.279,183.052 11.614,182.200 11.774 C 181.362 11.931,180.800 12.270,180.800 12.618 C 180.800 12.942,180.429 13.200,179.963 13.200 C 179.462 13.200,179.041 13.521,178.916 14.000 C 178.801 14.440,178.441 14.800,178.116 14.800 C 177.791 14.800,177.431 15.160,177.316 15.600 C 177.201 16.040,176.870 16.400,176.580 16.400 C 176.291 16.400,175.940 16.760,175.800 17.200 C 175.660 17.640,175.213 18.000,174.806 18.000 C 173.639 18.000,172.800 18.436,172.800 19.043 C 172.800 19.349,172.440 19.600,172.000 19.600 C 171.467 19.600,171.200 19.867,171.200 20.400 C 171.200 20.933,170.933 21.200,170.400 21.200 C 169.867 21.200,169.600 21.467,169.600 22.000 C 169.600 22.533,169.333 22.800,168.800 22.800 C 168.267 22.800,168.000 23.067,168.000 23.600 C 168.000 24.242,167.733 24.400,166.647 24.400 C 165.630 24.400,165.241 24.599,165.084 25.200 C 164.959 25.679,164.538 26.000,164.037 26.000 C 163.577 26.000,163.200 26.249,163.200 26.553 C 163.200 26.858,162.840 27.201,162.400 27.316 C 161.960 27.431,161.600 27.791,161.600 28.116 C 161.600 28.441,161.240 28.801,160.800 28.916 C 160.360 29.031,160.000 29.412,160.000 29.763 C 160.000 30.133,159.665 30.400,159.200 30.400 C 158.760 30.400,158.040 30.760,157.600 31.200 C 157.160 31.640,156.530 32.000,156.200 32.000 C 155.867 32.000,155.600 32.356,155.600 32.800 C 155.600 33.333,155.333 33.600,154.800 33.600 C 154.267 33.600,154.000 33.867,154.000 34.400 C 154.000 34.933,153.733 35.200,153.200 35.200 C 152.667 35.200,152.400 35.467,152.400 36.000 C 152.400 36.624,152.133 36.800,151.187 36.800 C 150.452 36.800,149.880 37.048,149.733 37.431 C 149.600 37.777,149.065 38.223,148.545 38.421 C 148.025 38.618,147.600 39.055,147.600 39.390 C 147.600 39.733,147.250 40.000,146.800 40.000 C 146.267 40.000,146.000 40.267,146.000 40.800 C 146.000 41.333,145.733 41.600,145.200 41.600 C 144.760 41.600,144.400 41.856,144.400 42.168 C 144.400 42.481,143.861 42.855,143.202 42.999 C 142.544 43.144,141.869 43.487,141.702 43.761 C 141.536 44.036,141.085 44.376,140.700 44.518 C 140.315 44.659,140.000 45.051,140.000 45.387 C 140.000 45.733,139.652 46.000,139.200 46.000 C 138.667 46.000,138.400 46.267,138.400 46.800 C 138.400 47.333,138.133 47.600,137.600 47.600 C 137.067 47.600,136.800 47.867,136.800 48.400 C 136.800 48.987,136.533 49.200,135.800 49.200 C 135.250 49.200,134.471 49.529,134.069 49.931 C 133.668 50.332,133.038 50.777,132.669 50.918 C 132.301 51.059,132.000 51.451,132.000 51.787 C 132.000 52.133,131.652 52.400,131.200 52.400 C 130.667 52.400,130.400 52.667,130.400 53.200 C 130.400 53.733,130.133 54.000,129.600 54.000 C 129.067 54.000,128.800 54.267,128.800 54.800 C 128.800 55.428,128.533 55.600,127.563 55.600 C 126.662 55.600,126.268 55.817,126.116 56.400 C 126.000 56.843,125.570 57.200,125.153 57.200 C 124.667 57.200,124.400 57.483,124.400 58.000 C 124.400 58.533,124.133 58.800,123.600 58.800 C 123.156 58.800,122.800 59.067,122.800 59.400 C 122.800 59.733,122.444 60.000,122.000 60.000 C 121.482 60.000,121.200 60.267,121.200 60.755 C 121.200 61.304,120.811 61.584,119.779 61.778 C 118.997 61.924,118.258 62.304,118.136 62.622 C 118.014 62.940,117.647 63.200,117.320 63.200 C 116.993 63.200,116.631 63.560,116.516 64.000 C 116.400 64.443,115.970 64.800,115.553 64.800 C 115.067 64.800,114.800 65.083,114.800 65.600 C 114.800 66.133,114.533 66.400,114.000 66.400 C 113.467 66.400,113.200 66.667,113.200 67.200 C 113.200 67.722,112.933 68.000,112.433 68.000 C 111.241 68.000,110.400 68.431,110.400 69.043 C 110.400 69.349,110.040 69.600,109.600 69.600 C 109.067 69.600,108.800 69.867,108.800 70.400 C 108.800 70.933,108.533 71.200,108.000 71.200 C 107.467 71.200,107.200 71.467,107.200 72.000 C 107.200 72.533,106.933 72.800,106.400 72.800 C 105.867 72.800,105.600 73.067,105.600 73.600 C 105.600 74.245,105.333 74.400,104.227 74.400 C 103.205 74.400,102.789 74.605,102.600 75.200 C 102.460 75.640,101.998 76.000,101.573 76.000 C 101.148 76.000,100.800 76.249,100.800 76.553 C 100.800 76.858,100.440 77.201,100.000 77.316 C 99.560 77.431,99.200 77.812,99.200 78.163 C 99.200 78.533,98.865 78.800,98.400 78.800 C 97.882 78.800,97.600 79.067,97.600 79.555 C 97.600 80.102,97.213 80.384,96.200 80.574 C 95.362 80.731,94.800 81.070,94.800 81.418 C 94.800 81.738,94.440 82.000,94.000 82.000 C 93.467 82.000,93.200 82.267,93.200 82.800 C 93.200 83.333,92.933 83.600,92.400 83.600 C 91.867 83.600,91.600 83.867,91.600 84.400 C 91.600 84.933,91.333 85.200,90.800 85.200 C 90.267 85.200,90.000 85.467,90.000 86.000 C 90.000 86.622,89.733 86.800,88.803 86.800 C 88.040 86.800,87.426 87.090,87.107 87.600 C 86.832 88.040,86.291 88.400,85.904 88.400 C 85.467 88.400,85.200 88.703,85.200 89.200 C 85.200 89.733,84.933 90.000,84.400 90.000 C 83.867 90.000,83.600 90.267,83.600 90.800 C 83.600 91.333,83.333 91.600,82.800 91.600 C 82.360 91.600,82.000 91.862,82.000 92.182 C 82.000 92.530,81.438 92.869,80.600 93.026 C 79.798 93.177,79.200 93.526,79.200 93.845 C 79.200 94.150,78.932 94.400,78.603 94.400 C 78.275 94.400,77.782 94.760,77.507 95.200 C 77.232 95.640,76.781 96.000,76.504 96.000 C 76.227 96.000,76.000 96.287,76.000 96.637 C 76.000 96.988,75.640 97.369,75.200 97.484 C 74.003 97.797,74.003 102.203,75.200 102.516 C 75.640 102.631,76.000 103.012,76.000 103.363 C 76.000 103.713,76.230 104.000,76.511 104.000 C 76.792 104.000,77.326 104.315,77.697 104.700 C 79.244 106.305,79.862 106.750,80.903 107.011 C 81.506 107.163,82.000 107.537,82.000 107.843 C 82.000 108.150,82.360 108.400,82.800 108.400 C 83.333 108.400,83.600 108.667,83.600 109.200 C 83.600 109.733,83.867 110.000,84.400 110.000 C 84.933 110.000,85.200 110.267,85.200 110.800 C 85.200 111.297,85.467 111.600,85.904 111.600 C 86.291 111.600,86.832 111.960,87.107 112.400 C 87.426 112.910,88.040 113.200,88.803 113.200 C 89.733 113.200,90.000 113.378,90.000 114.000 C 90.000 114.533,90.267 114.800,90.800 114.800 C 91.333 114.800,91.600 115.067,91.600 115.600 C 91.600 116.133,91.867 116.400,92.400 116.400 C 92.933 116.400,93.200 116.667,93.200 117.200 C 93.200 117.733,93.467 118.000,94.000 118.000 C 94.440 118.000,94.800 118.262,94.800 118.582 C 94.800 118.930,95.362 119.269,96.200 119.426 C 97.213 119.616,97.600 119.898,97.600 120.445 C 97.600 120.918,97.881 121.200,98.353 121.200 C 98.770 121.200,99.200 121.557,99.316 122.000 C 99.431 122.440,99.812 122.800,100.163 122.800 C 100.513 122.800,100.800 123.070,100.800 123.400 C 100.800 123.730,101.154 124.000,101.586 124.000 C 102.018 124.000,102.565 124.360,102.800 124.800 C 103.080 125.324,103.638 125.600,104.414 125.600 C 105.333 125.600,105.600 125.780,105.600 126.400 C 105.600 126.933,105.867 127.200,106.400 127.200 C 106.933 127.200,107.200 127.467,107.200 128.000 C 107.200 128.533,107.467 128.800,108.000 128.800 C 108.533 128.800,108.800 129.067,108.800 129.600 C 108.800 130.133,109.067 130.400,109.600 130.400 C 110.040 130.400,110.400 130.651,110.400 130.957 C 110.400 131.569,111.241 132.000,112.433 132.000 C 112.933 132.000,113.200 132.278,113.200 132.800 C 113.200 133.333,113.467 133.600,114.000 133.600 C 114.533 133.600,114.800 133.867,114.800 134.400 C 114.800 134.917,115.067 135.200,115.553 135.200 C 115.970 135.200,116.400 135.557,116.516 136.000 C 116.631 136.440,116.993 136.800,117.320 136.800 C 117.647 136.800,118.014 137.060,118.136 137.378 C 118.258 137.696,118.997 138.076,119.779 138.222 C 120.811 138.416,121.200 138.696,121.200 139.245 C 121.200 139.733,121.482 140.000,122.000 140.000 C 122.444 140.000,122.800 140.267,122.800 140.600 C 122.800 140.933,123.156 141.200,123.600 141.200 C 124.133 141.200,124.400 141.467,124.400 142.000 C 124.400 142.533,124.667 142.800,125.200 142.800 C 125.640 142.800,126.000 143.051,126.000 143.357 C 126.000 143.969,126.841 144.400,128.033 144.400 C 128.533 144.400,128.800 144.678,128.800 145.200 C 128.800 145.733,129.067 146.000,129.600 146.000 C 130.133 146.000,130.400 146.267,130.400 146.800 C 130.400 147.317,130.667 147.600,131.153 147.600 C 131.570 147.600,132.000 147.957,132.116 148.400 C 132.241 148.879,132.662 149.200,133.163 149.200 C 133.629 149.200,134.000 149.458,134.000 149.782 C 134.000 150.130,134.562 150.469,135.400 150.626 C 136.413 150.816,136.800 151.098,136.800 151.645 C 136.800 152.133,137.082 152.400,137.600 152.400 C 138.133 152.400,138.400 152.667,138.400 153.200 C 138.400 153.733,138.667 154.000,139.200 154.000 C 139.652 154.000,140.000 154.267,140.000 154.613 C 140.000 154.949,140.315 155.341,140.700 155.482 C 141.085 155.624,141.536 155.964,141.702 156.239 C 141.869 156.513,142.544 156.856,143.202 157.001 C 143.861 157.145,144.400 157.519,144.400 157.832 C 144.400 158.144,144.760 158.400,145.200 158.400 C 145.733 158.400,146.000 158.667,146.000 159.200 C 146.000 159.733,146.267 160.000,146.800 160.000 C 147.250 160.000,147.600 160.267,147.600 160.610 C 147.600 160.945,148.025 161.382,148.545 161.579 C 149.065 161.777,149.600 162.223,149.733 162.569 C 149.880 162.952,150.452 163.200,151.187 163.200 C 152.133 163.200,152.400 163.376,152.400 164.000 C 152.400 164.533,152.667 164.800,153.200 164.800 C 153.733 164.800,154.000 165.067,154.000 165.600 C 154.000 166.133,154.267 166.400,154.800 166.400 C 155.333 166.400,155.600 166.667,155.600 167.200 C 155.600 167.718,155.867 168.000,156.357 168.000 C 156.774 168.000,157.212 168.253,157.330 168.562 C 157.449 168.872,158.098 169.246,158.773 169.394 C 159.483 169.550,160.000 169.919,160.000 170.269 C 160.000 170.602,160.360 170.969,160.800 171.084 C 161.240 171.199,161.600 171.559,161.600 171.884 C 161.600 172.209,161.960 172.569,162.400 172.684 C 162.840 172.799,163.200 173.057,163.200 173.257 C 163.200 173.456,163.650 173.791,164.200 174.000 C 164.750 174.209,165.200 174.655,165.200 174.990 C 165.200 175.420,165.612 175.600,166.600 175.600 C 167.733 175.600,168.000 175.752,168.000 176.400 C 168.000 176.933,168.267 177.200,168.800 177.200 C 169.333 177.200,169.600 177.467,169.600 178.000 C 169.600 178.533,169.867 178.800,170.400 178.800 C 170.933 178.800,171.200 179.067,171.200 179.600 C 171.200 180.044,171.467 180.400,171.800 180.400 C 172.130 180.400,172.760 180.760,173.200 181.200 C 173.640 181.640,174.348 182.000,174.773 182.000 C 175.198 182.000,175.660 182.360,175.800 182.800 C 175.940 183.240,176.312 183.600,176.627 183.600 C 176.942 183.600,177.200 183.876,177.200 184.213 C 177.200 184.549,177.515 184.943,177.900 185.086 C 178.285 185.230,178.835 185.674,179.123 186.074 C 179.410 186.473,179.815 186.800,180.023 186.800 C 180.230 186.800,180.760 187.160,181.200 187.600 C 181.640 188.040,182.360 188.400,182.800 188.400 C 183.265 188.400,183.600 188.667,183.600 189.037 C 183.600 189.388,183.960 189.769,184.400 189.884 C 184.840 189.999,185.200 190.342,185.200 190.647 C 185.200 190.951,185.560 191.200,186.000 191.200 C 186.533 191.200,186.800 191.467,186.800 192.000 C 186.800 192.497,187.067 192.800,187.504 192.800 C 187.891 192.800,188.432 193.160,188.707 193.600 C 189.026 194.110,189.640 194.400,190.403 194.400 C 191.333 194.400,191.600 194.578,191.600 195.200 C 191.600 195.640,191.858 196.000,192.173 196.000 C 192.488 196.000,192.860 196.360,193.000 196.800 C 193.140 197.240,193.500 197.600,193.800 197.600 C 194.100 197.600,194.460 197.960,194.600 198.400 C 194.740 198.840,195.202 199.200,195.627 199.200 C 196.052 199.200,196.400 199.451,196.400 199.757 C 196.400 200.477,197.278 200.800,199.233 200.800 L 200.800 200.800 200.800 163.900 L 200.799 127.000 209.400 127.115 C 217.639 127.225,218.000 127.263,218.000 128.015 C 218.000 128.743,218.292 128.800,222.000 128.800 C 225.733 128.800,226.000 128.853,226.000 129.600 C 226.000 130.302,226.267 130.400,228.186 130.400 C 229.962 130.400,230.452 130.550,230.800 131.200 C 231.135 131.827,231.638 132.000,233.118 132.000 C 234.574 132.000,235.122 132.183,235.507 132.800 C 235.898 133.426,236.440 133.600,238.003 133.600 C 239.733 133.600,240.000 133.707,240.000 134.400 C 240.000 135.067,240.267 135.200,241.600 135.200 C 242.667 135.200,243.467 135.467,244.000 136.000 C 244.485 136.485,245.333 136.800,246.153 136.800 C 247.170 136.800,247.559 136.999,247.716 137.600 C 247.875 138.206,248.262 138.400,249.316 138.400 C 250.370 138.400,250.757 138.594,250.916 139.200 C 251.031 139.640,251.457 140.006,251.863 140.013 C 252.268 140.020,252.949 140.290,253.376 140.613 C 253.804 140.936,254.479 141.200,254.876 141.200 C 255.333 141.200,255.600 141.495,255.600 142.000 C 255.600 142.667,255.867 142.800,257.200 142.800 C 258.533 142.800,258.800 142.933,258.800 143.600 C 258.800 144.117,259.067 144.400,259.553 144.400 C 259.970 144.400,260.400 144.757,260.516 145.200 C 260.668 145.783,261.062 146.000,261.963 146.000 C 262.933 146.000,263.200 146.172,263.200 146.800 C 263.200 147.317,263.467 147.600,263.953 147.600 C 264.370 147.600,264.800 147.957,264.916 148.400 C 265.076 149.013,265.462 149.200,266.563 149.200 C 267.733 149.200,268.000 149.348,268.000 150.000 C 268.000 150.533,268.267 150.800,268.800 150.800 C 269.333 150.800,269.600 151.067,269.600 151.600 C 269.600 152.133,269.867 152.400,270.400 152.400 C 270.865 152.400,271.200 152.667,271.200 153.037 C 271.200 153.388,271.560 153.769,272.000 153.884 C 272.440 153.999,272.800 154.330,272.800 154.620 C 272.800 154.909,273.160 155.260,273.600 155.400 C 274.040 155.540,274.400 155.912,274.400 156.227 C 274.400 156.542,274.760 156.800,275.200 156.800 C 275.665 156.800,276.000 157.067,276.000 157.437 C 276.000 157.788,276.360 158.169,276.800 158.284 C 277.240 158.399,277.600 158.736,277.600 159.033 C 277.600 159.329,277.960 159.765,278.400 160.000 C 278.840 160.235,279.200 160.692,279.200 161.014 C 279.200 161.336,279.458 161.600,279.773 161.600 C 280.088 161.600,280.460 161.960,280.600 162.400 C 280.740 162.840,281.112 163.200,281.427 163.200 C 281.742 163.200,282.000 163.487,282.000 163.837 C 282.000 164.188,282.360 164.569,282.800 164.684 C 283.243 164.800,283.600 165.230,283.600 165.647 C 283.600 166.133,283.883 166.400,284.400 166.400 C 284.933 166.400,285.200 166.667,285.200 167.200 C 285.200 167.733,285.467 168.000,286.000 168.000 C 286.497 168.000,286.800 168.267,286.800 168.704 C 286.800 169.091,287.160 169.632,287.600 169.907 C 288.040 170.182,288.400 170.834,288.400 171.357 C 288.400 171.970,288.683 172.381,289.200 172.516 C 289.640 172.631,290.000 173.000,290.000 173.336 C 290.000 173.671,290.360 174.060,290.800 174.200 C 291.240 174.340,291.600 174.789,291.600 175.199 C 291.600 176.135,293.247 178.760,293.849 178.783 C 294.096 178.792,294.413 179.520,294.554 180.400 C 294.719 181.435,295.020 182.000,295.405 182.000 C 295.733 182.000,296.000 182.358,296.000 182.800 C 296.000 183.240,296.360 183.960,296.800 184.400 C 297.240 184.840,297.600 185.560,297.600 186.000 C 297.600 186.533,297.867 186.800,298.400 186.800 C 299.052 186.800,299.200 187.067,299.200 188.237 C 299.200 189.308,299.392 189.725,299.952 189.872 C 300.506 190.016,300.758 190.549,300.909 191.894 C 301.032 192.985,301.374 193.866,301.758 194.080 C 302.178 194.316,302.400 194.985,302.400 196.020 C 302.400 197.333,302.535 197.600,303.200 197.600 C 303.893 197.600,304.000 197.867,304.000 199.586 C 304.000 201.162,304.165 201.660,304.800 202.000 C 305.438 202.342,305.600 202.838,305.600 204.452 C 305.600 206.138,305.733 206.510,306.400 206.684 C 307.084 206.863,307.200 207.230,307.200 209.213 C 307.200 210.538,307.388 211.596,307.638 211.679 C 308.190 211.863,308.760 214.760,308.783 217.500 C 308.795 218.991,308.957 219.600,309.342 219.600 C 309.775 219.600,309.926 221.386,310.096 228.500 C 310.395 241.007,310.020 255.600,309.400 255.600 C 309.081 255.600,308.836 256.776,308.672 259.096 C 308.499 261.553,308.243 262.725,307.813 263.040 C 307.390 263.349,307.200 264.175,307.200 265.697 C 307.200 267.570,307.078 267.939,306.400 268.116 C 305.723 268.293,305.600 268.662,305.600 270.516 C 305.600 272.370,305.477 272.739,304.800 272.916 C 304.134 273.090,304.000 273.462,304.000 275.136 C 304.000 276.795,303.860 277.190,303.200 277.400 C 302.579 277.597,302.400 278.005,302.400 279.227 C 302.400 280.300,302.224 280.800,301.847 280.800 C 301.216 280.800,300.813 282.000,300.805 283.900 C 300.801 284.932,300.635 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.935 288.400,297.600 288.667,297.600 289.037 C 297.600 289.387,297.240 290.131,296.800 290.691 C 296.360 291.250,296.000 292.044,296.000 292.454 C 296.000 292.864,295.749 293.200,295.443 293.200 C 294.831 293.200,294.400 294.041,294.400 295.233 C 294.400 295.655,294.133 296.000,293.808 296.000 C 293.482 296.000,293.102 296.450,292.964 297.000 C 292.826 297.550,292.463 298.000,292.157 298.000 C 291.787 298.000,291.600 298.471,291.600 299.400 C 291.600 300.533,291.448 300.800,290.800 300.800 C 290.267 300.800,290.000 301.067,290.000 301.600 C 290.000 302.133,289.733 302.400,289.200 302.400 C 288.578 302.400,288.400 302.667,288.400 303.597 C 288.400 304.360,288.110 304.974,287.600 305.293 C 287.160 305.568,286.800 306.109,286.800 306.496 C 286.800 306.933,286.497 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.935 308.800,283.600 309.067,283.600 309.437 C 283.600 309.788,283.240 310.169,282.800 310.284 C 282.360 310.399,282.000 310.676,282.000 310.899 C 282.000 311.123,281.370 311.900,280.600 312.626 C 279.830 313.352,279.200 314.126,279.200 314.346 C 279.200 314.566,278.840 314.860,278.400 315.000 C 277.960 315.140,277.600 315.491,277.600 315.780 C 277.600 316.070,277.240 316.401,276.800 316.516 C 276.360 316.631,276.000 316.991,276.000 317.316 C 276.000 317.641,275.640 318.001,275.200 318.116 C 274.760 318.231,274.400 318.612,274.400 318.963 C 274.400 319.333,274.065 319.600,273.600 319.600 C 273.067 319.600,272.800 319.867,272.800 320.400 C 272.800 320.933,272.533 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.118,269.333 324.400,268.843 324.400 C 268.426 324.400,267.988 324.653,267.870 324.962 C 267.751 325.272,267.103 325.646,266.429 325.794 C 265.756 325.941,265.069 326.287,264.902 326.561 C 264.736 326.836,264.285 327.176,263.900 327.318 C 263.515 327.459,263.200 327.831,263.200 328.143 C 263.200 328.475,262.619 328.820,261.800 328.974 C 260.962 329.131,260.400 329.470,260.400 329.818 C 260.400 330.138,260.040 330.400,259.600 330.400 C 259.067 330.400,258.800 330.667,258.800 331.200 C 258.800 331.852,258.533 332.000,257.363 332.000 C 256.262 332.000,255.876 332.187,255.716 332.800 C 255.600 333.243,255.170 333.600,254.753 333.600 C 254.339 333.600,253.640 333.960,253.200 334.400 C 252.760 334.840,252.083 335.200,251.696 335.200 C 251.309 335.200,250.768 335.560,250.493 336.000 C 250.174 336.510,249.560 336.800,248.797 336.800 C 247.867 336.800,247.600 336.978,247.600 337.600 C 247.600 338.261,247.333 338.400,246.062 338.400 C 245.032 338.400,244.285 338.664,243.800 339.200 C 243.315 339.736,242.568 340.000,241.538 340.000 C 240.267 340.000,240.000 340.139,240.000 340.800 C 240.000 341.502,239.733 341.600,237.820 341.600 C 236.415 341.600,235.526 341.792,235.320 342.140 C 235.144 342.436,234.106 342.798,233.014 342.944 C 231.903 343.092,230.880 343.471,230.694 343.804 C 230.465 344.213,229.706 344.400,228.276 344.400 C 226.626 344.400,226.089 344.566,225.693 345.200 C 225.256 345.899,224.760 346.000,221.759 346.000 C 218.662 346.000,218.305 346.078,218.116 346.800 C 217.916 347.566,217.570 347.600,209.986 347.600 C 201.767 347.600,200.800 347.710,200.800 348.643 C 200.800 348.949,200.440 349.200,200.000 349.200 C 199.560 349.200,199.200 348.949,199.200 348.643 C 199.200 347.710,198.233 347.600,190.014 347.600 C 182.430 347.600,182.084 347.566,181.884 346.800 C 181.695 346.078,181.338 346.000,178.241 346.000 C 175.240 346.000,174.744 345.899,174.307 345.200 C 173.911 344.566,173.374 344.400,171.724 344.400 C 170.294 344.400,169.535 344.213,169.306 343.804 C 169.120 343.471,168.097 343.092,166.986 342.944 C 165.894 342.798,164.856 342.436,164.680 342.140 C 164.474 341.792,163.585 341.600,162.180 341.600 C 160.267 341.600,160.000 341.502,160.000 340.800 C 160.000 340.137,159.733 340.000,158.447 340.000 C 157.230 340.000,156.848 339.827,156.684 339.200 C 156.509 338.532,156.138 338.400,154.437 338.400 C 152.667 338.400,152.400 338.295,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.467,148.933 335.200,148.400 335.200 C 147.960 335.200,147.240 334.840,146.800 334.400 C 146.360 333.960,145.661 333.600,145.247 333.600 C 144.830 333.600,144.400 333.243,144.284 332.800 C 144.124 332.187,143.738 332.000,142.637 332.000 C 141.467 332.000,141.200 331.852,141.200 331.200 C 141.200 330.756,140.933 330.400,140.600 330.400 C 140.270 330.400,139.640 330.040,139.200 329.600 C 138.760 329.160,138.040 328.800,137.600 328.800 C 137.135 328.800,136.800 328.533,136.800 328.163 C 136.800 327.812,136.440 327.431,136.000 327.316 C 135.560 327.201,135.200 326.942,135.200 326.741 C 135.200 326.540,134.885 326.260,134.500 326.119 C 134.115 325.979,133.371 325.534,132.846 325.132 C 132.321 324.729,131.556 324.400,131.146 324.400 C 130.667 324.400,130.400 324.114,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.867 319.600,125.600 319.333,125.600 318.800 C 125.600 318.267,125.333 318.000,124.800 318.000 C 124.335 318.000,124.000 317.733,124.000 317.363 C 124.000 317.012,123.640 316.631,123.200 316.516 C 122.760 316.401,122.400 316.058,122.400 315.753 C 122.400 315.449,122.124 315.200,121.787 315.200 C 121.451 315.200,121.055 314.885,120.908 314.500 C 120.761 314.115,120.046 313.239,119.320 312.553 C 118.594 311.867,118.000 311.123,118.000 310.899 C 118.000 310.676,117.640 310.399,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.503 307.200,113.200 306.933,113.200 306.496 C 113.200 306.109,112.840 305.568,112.400 305.293 C 111.935 305.003,111.600 304.360,111.600 303.759 C 111.600 303.062,111.340 302.657,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.552 300.800,108.400 300.533,108.400 299.400 C 108.400 298.471,108.213 298.000,107.843 298.000 C 107.537 298.000,107.174 297.550,107.036 297.000 C 106.898 296.450,106.518 296.000,106.192 296.000 C 105.867 296.000,105.600 295.655,105.600 295.233 C 105.600 294.041,105.169 293.200,104.557 293.200 C 104.251 293.200,104.000 292.864,104.000 292.454 C 104.000 292.044,103.640 291.250,103.200 290.691 C 102.760 290.131,102.400 289.431,102.400 289.133 C 102.400 288.836,102.040 288.368,101.600 288.093 C 101.090 287.774,100.800 287.160,100.800 286.397 C 100.800 285.467,100.622 285.200,100.000 285.200 C 99.365 285.200,99.199 284.932,99.195 283.900 C 99.187 282.000,98.784 280.800,98.153 280.800 C 97.776 280.800,97.600 280.300,97.600 279.227 C 97.600 278.005,97.421 277.597,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.527 272.740,94.400 272.370,94.400 270.580 C 94.400 268.805,94.268 268.412,93.600 268.200 C 92.926 267.986,92.800 267.595,92.800 265.717 C 92.800 264.177,92.611 263.350,92.187 263.040 C 91.757 262.725,91.501 261.553,91.328 259.096 C 91.164 256.771,90.920 255.600,90.599 255.600 C 90.243 255.600,90.061 253.269,89.905 246.729 C 89.716 238.778,89.619 237.803,88.970 237.329 C 88.388 236.903,83.221 236.800,62.524 236.800 L 36.800 236.800 36.800 248.304 C 36.800 259.374,36.830 259.826,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.528 277.200,41.600 277.467,41.600 280.180 C 41.600 282.268,41.763 283.256,42.143 283.480 C 42.442 283.656,42.784 284.689,42.903 285.776 C 43.028 286.917,43.389 287.949,43.759 288.220 C 44.191 288.535,44.400 289.307,44.400 290.582 C 44.400 292.138,44.542 292.512,45.200 292.684 C 45.813 292.845,46.001 293.232,46.005 294.347 C 46.013 296.391,46.400 297.600,47.047 297.600 C 47.426 297.600,47.600 298.104,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.067 300.800,49.200 301.067,49.200 302.400 C 49.200 303.467,49.467 304.267,50.000 304.800 C 50.455 305.255,50.800 306.133,50.800 306.837 C 50.800 307.738,51.017 308.132,51.600 308.284 C 52.206 308.443,52.400 308.830,52.400 309.884 C 52.400 310.938,52.594 311.325,53.200 311.484 C 53.806 311.643,54.000 312.030,54.000 313.084 C 54.000 314.138,54.194 314.525,54.800 314.684 C 55.364 314.832,55.600 315.230,55.600 316.033 C 55.600 316.762,55.887 317.326,56.400 317.600 C 56.840 317.835,57.200 318.361,57.200 318.767 C 57.200 319.174,57.560 319.601,58.000 319.716 C 58.585 319.869,58.800 320.262,58.800 321.175 C 58.800 321.907,59.044 322.519,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 62.979 327.200,63.200 327.467,63.200 328.167 C 63.200 329.548,63.598 330.400,64.243 330.400 C 64.549 330.400,64.800 330.760,64.800 331.200 C 64.800 331.718,65.067 332.000,65.555 332.000 C 66.102 332.000,66.384 332.387,66.574 333.400 C 66.731 334.238,67.070 334.800,67.418 334.800 C 67.742 334.800,68.000 335.171,68.000 335.637 C 68.000 336.138,68.321 336.559,68.800 336.684 C 69.243 336.800,69.600 337.230,69.600 337.647 C 69.600 338.133,69.883 338.400,70.400 338.400 C 70.924 338.400,71.200 338.667,71.200 339.173 C 71.200 339.598,71.560 340.060,72.000 340.200 C 72.560 340.378,72.800 340.805,72.800 341.627 C 72.800 342.533,72.982 342.800,73.600 342.800 C 74.117 342.800,74.400 343.067,74.400 343.553 C 74.400 343.970,74.757 344.400,75.200 344.516 C 75.640 344.631,76.000 345.012,76.000 345.363 C 76.000 345.713,76.270 346.000,76.600 346.000 C 76.930 346.000,77.200 346.287,77.200 346.637 C 77.200 346.988,77.560 347.369,78.000 347.484 C 78.443 347.600,78.800 348.030,78.800 348.447 C 78.800 348.933,79.083 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.333 360.000,91.600 360.267,91.600 360.800 C 91.600 361.333,91.867 361.600,92.400 361.600 C 92.917 361.600,93.200 361.867,93.200 362.353 C 93.200 362.770,93.557 363.200,94.000 363.316 C 94.440 363.431,94.800 363.812,94.800 364.163 C 94.800 364.575,95.151 364.800,95.797 364.800 C 96.360 364.800,97.010 365.148,97.293 365.600 C 97.568 366.040,98.109 366.400,98.496 366.400 C 98.933 366.400,99.200 366.703,99.200 367.200 C 99.200 367.733,99.467 368.000,100.000 368.000 C 100.450 368.000,100.800 368.267,100.800 368.610 C 100.800 368.945,101.250 369.391,101.800 369.600 C 102.350 369.809,102.800 370.156,102.800 370.372 C 102.800 370.587,103.430 370.882,104.200 371.026 C 105.052 371.186,105.600 371.521,105.600 371.882 C 105.600 372.208,105.960 372.569,106.400 372.684 C 106.840 372.799,107.200 373.122,107.200 373.402 C 107.200 373.682,107.813 374.026,108.561 374.166 C 109.310 374.307,110.024 374.687,110.149 375.011 C 110.273 375.335,110.741 375.600,111.187 375.600 C 111.733 375.600,112.000 375.863,112.000 376.400 C 112.000 377.048,112.267 377.200,113.400 377.200 C 114.533 377.200,114.800 377.352,114.800 378.000 C 114.800 378.667,115.067 378.800,116.400 378.800 C 117.733 378.800,118.000 378.933,118.000 379.600 C 118.000 380.097,118.267 380.400,118.704 380.400 C 119.091 380.400,119.632 380.760,119.907 381.200 C 120.219 381.699,120.840 382.000,121.557 382.000 C 122.370 382.000,122.768 382.234,122.916 382.800 C 123.075 383.406,123.462 383.600,124.516 383.600 C 125.570 383.600,125.957 383.794,126.116 384.400 C 126.276 385.013,126.662 385.200,127.763 385.200 C 128.754 385.200,129.200 385.381,129.200 385.782 C 129.200 386.134,129.774 386.471,130.655 386.637 C 131.455 386.787,132.445 387.245,132.855 387.655 C 133.333 388.133,134.173 388.400,135.200 388.400 C 136.301 388.400,136.800 388.574,136.800 388.957 C 136.800 389.602,137.652 390.000,139.033 390.000 C 139.626 390.000,140.000 390.232,140.000 390.600 C 140.000 391.044,140.467 391.200,141.800 391.200 C 143.067 391.200,143.837 391.437,144.400 392.000 C 144.987 392.587,145.733 392.800,147.200 392.800 C 148.933 392.800,149.200 392.907,149.200 393.600 C 149.200 394.309,149.467 394.400,151.553 394.400 C 153.570 394.400,153.937 394.514,154.116 395.200 C 154.302 395.911,154.662 396.000,157.363 396.000 C 160.133 396.000,160.400 396.070,160.400 396.800 C 160.400 397.537,160.667 397.600,163.797 397.600 C 166.760 397.600,167.257 397.702,167.693 398.400 C 168.144 399.123,168.626 399.200,172.696 399.200 C 175.432 399.200,177.200 399.357,177.200 399.600 C 177.200 399.862,185.067 400.000,200.000 400.000 C 214.933 400.000,222.800 399.862,222.800 399.600 C 222.800 399.357,224.568 399.200,227.304 399.200 C 231.374 399.200,231.856 399.123,232.307 398.400 C 232.743 397.702,233.240 397.600,236.203 397.600 C 239.333 397.600,239.600 397.537,239.600 396.800 C 239.600 396.070,239.867 396.000,242.637 396.000 C 245.338 396.000,245.698 395.911,245.884 395.200 C 246.063 394.514,246.430 394.400,248.447 394.400 C 250.533 394.400,250.800 394.309,250.800 393.600 C 250.800 392.901,251.067 392.800,252.911 392.800 C 254.527 392.800,255.183 392.612,255.707 392.000 C 256.204 391.420,256.887 391.200,258.196 391.200 C 259.533 391.200,260.000 391.045,260.000 390.600 C 260.000 390.178,260.426 390.000,261.437 390.000 C 262.538 390.000,262.924 389.813,263.084 389.200 C 263.248 388.573,263.630 388.400,264.847 388.400 C 265.867 388.400,266.675 388.125,267.200 387.600 C 267.640 387.160,268.452 386.800,269.004 386.800 C 269.556 386.800,270.316 386.440,270.693 386.000 C 271.083 385.545,271.873 385.200,272.526 385.200 C 273.338 385.200,273.736 384.966,273.884 384.400 C 274.043 383.794,274.430 383.600,275.484 383.600 C 276.538 383.600,276.925 383.406,277.084 382.800 C 277.232 382.234,277.630 382.000,278.443 382.000 C 279.160 382.000,279.781 381.699,280.093 381.200 C 280.368 380.760,280.909 380.400,281.296 380.400 C 281.733 380.400,282.000 380.097,282.000 379.600 C 282.000 378.933,282.267 378.800,283.600 378.800 C 284.933 378.800,285.200 378.667,285.200 378.000 C 285.200 377.352,285.467 377.200,286.600 377.200 C 287.733 377.200,288.000 377.048,288.000 376.400 C 288.000 375.863,288.267 375.600,288.813 375.600 C 289.259 375.600,289.727 375.335,289.851 375.011 C 289.976 374.687,290.690 374.307,291.439 374.166 C 292.187 374.026,292.800 373.682,292.800 373.402 C 292.800 373.122,293.160 372.799,293.600 372.684 C 294.040 372.569,294.400 372.208,294.400 371.882 C 294.400 371.521,294.948 371.186,295.800 371.026 C 296.570 370.882,297.200 370.587,297.200 370.372 C 297.200 370.156,297.650 369.809,298.200 369.600 C 298.750 369.391,299.200 368.945,299.200 368.610 C 299.200 368.267,299.550 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.689,301.067 366.400,301.538 366.400 C 301.944 366.400,302.602 366.040,303.000 365.600 C 303.398 365.160,304.056 364.800,304.462 364.800 C 304.871 364.800,305.200 364.515,305.200 364.163 C 305.200 363.812,305.560 363.431,306.000 363.316 C 306.440 363.201,306.800 362.841,306.800 362.516 C 306.800 362.191,307.160 361.831,307.600 361.716 C 308.043 361.600,308.400 361.170,308.400 360.753 C 308.400 360.267,308.683 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.151,311.600 357.847 C 311.600 357.542,311.960 357.199,312.400 357.084 C 312.840 356.969,313.200 356.588,313.200 356.237 C 313.200 355.867,313.535 355.600,314.000 355.600 C 314.533 355.600,314.800 355.333,314.800 354.800 C 314.800 354.267,315.067 354.000,315.600 354.000 C 316.133 354.000,316.400 353.733,316.400 353.200 C 316.400 352.667,316.667 352.400,317.200 352.400 C 317.733 352.400,318.000 352.133,318.000 351.600 C 318.000 351.067,318.267 350.800,318.800 350.800 C 319.333 350.800,319.600 350.533,319.600 350.000 C 319.600 349.467,319.867 349.200,320.400 349.200 C 320.917 349.200,321.200 348.933,321.200 348.447 C 321.200 348.030,321.557 347.600,322.000 347.484 C 322.440 347.369,322.800 346.988,322.800 346.637 C 322.800 346.287,323.070 346.000,323.400 346.000 C 323.730 346.000,324.000 345.713,324.000 345.363 C 324.000 345.012,324.360 344.631,324.800 344.516 C 325.243 344.400,325.600 343.970,325.600 343.553 C 325.600 343.067,325.883 342.800,326.400 342.800 C 327.018 342.800,327.200 342.533,327.200 341.627 C 327.200 340.805,327.440 340.378,328.000 340.200 C 328.440 340.060,328.800 339.598,328.800 339.173 C 328.800 338.667,329.076 338.400,329.600 338.400 C 330.117 338.400,330.400 338.133,330.400 337.647 C 330.400 337.230,330.757 336.800,331.200 336.684 C 331.679 336.559,332.000 336.138,332.000 335.637 C 332.000 335.171,332.258 334.800,332.582 334.800 C 332.930 334.800,333.269 334.238,333.426 333.400 C 333.616 332.387,333.898 332.000,334.445 332.000 C 334.933 332.000,335.200 331.718,335.200 331.200 C 335.200 330.760,335.451 330.400,335.757 330.400 C 336.402 330.400,336.800 329.548,336.800 328.167 C 336.800 327.467,337.021 327.200,337.600 327.200 C 338.133 327.200,338.400 326.933,338.400 326.400 C 338.400 325.960,338.650 325.600,338.955 325.600 C 339.271 325.600,339.621 325.011,339.766 324.239 C 339.907 323.490,340.287 322.776,340.611 322.651 C 340.956 322.519,341.200 321.907,341.200 321.175 C 341.200 320.262,341.415 319.869,342.000 319.716 C 342.440 319.601,342.800 319.174,342.800 318.767 C 342.800 318.361,343.160 317.835,343.600 317.600 C 344.113 317.326,344.400 316.762,344.400 316.033 C 344.400 315.230,344.636 314.832,345.200 314.684 C 345.806 314.525,346.000 314.138,346.000 313.084 C 346.000 312.030,346.194 311.643,346.800 311.484 C 347.406 311.325,347.600 310.938,347.600 309.884 C 347.600 308.830,347.794 308.443,348.400 308.284 C 348.983 308.132,349.200 307.738,349.200 306.837 C 349.200 306.133,349.545 305.255,350.000 304.800 C 350.533 304.267,350.800 303.467,350.800 302.400 C 350.800 301.067,350.933 300.800,351.600 300.800 C 352.248 300.800,352.400 300.533,352.400 299.400 C 352.400 298.533,352.705 297.695,353.200 297.200 C 353.757 296.643,354.000 295.867,354.000 294.647 C 354.000 293.230,354.153 292.853,354.800 292.684 C 355.458 292.512,355.600 292.138,355.600 290.582 C 355.600 289.307,355.809 288.535,356.241 288.220 C 356.611 287.949,356.972 286.917,357.097 285.776 C 357.216 284.689,357.558 283.656,357.857 283.480 C 358.237 283.256,358.400 282.268,358.400 280.180 C 358.400 277.467,358.472 277.200,359.200 277.200 C 359.937 277.200,360.000 276.933,360.000 273.803 C 360.000 270.840,360.102 270.343,360.800 269.907 C 361.519 269.458,361.600 268.974,361.600 265.107 C 361.600 261.240,361.681 260.756,362.400 260.307 C 363.185 259.817,363.200 259.374,363.200 237.400 C 363.200 215.426,363.185 214.983,362.400 214.493 C 361.685 214.046,361.600 213.560,361.600 209.893 C 361.600 206.226,361.515 205.740,360.800 205.293 C 360.101 204.856,360.000 204.360,360.000 201.359 C 360.000 198.262,359.922 197.905,359.200 197.716 C 358.491 197.531,358.400 197.170,358.400 194.553 C 358.400 192.195,358.279 191.600,357.800 191.600 C 357.374 191.600,357.198 191.164,357.195 190.100 C 357.187 188.011,356.805 186.800,356.153 186.800 C 355.766 186.800,355.600 186.271,355.600 185.033 C 355.600 182.886,355.296 182.000,354.557 182.000 C 354.196 182.000,353.998 181.542,353.995 180.700 C 353.987 178.800,353.584 177.600,352.953 177.600 C 352.574 177.600,352.400 177.096,352.400 176.000 C 352.400 174.703,352.258 174.400,351.651 174.400 C 351.042 174.400,350.865 174.017,350.704 172.346 C 350.577 171.017,350.276 170.162,349.854 169.926 C 349.441 169.695,349.200 169.038,349.200 168.143 C 349.200 167.062,349.010 166.675,348.400 166.516 C 347.803 166.360,347.600 165.970,347.600 164.980 C 347.600 164.005,347.388 163.587,346.800 163.400 C 346.205 163.211,346.000 162.795,346.000 161.773 C 346.000 160.667,345.845 160.400,345.200 160.400 C 344.548 160.400,344.400 160.133,344.400 158.963 C 344.400 157.862,344.213 157.476,343.600 157.316 C 343.157 157.200,342.800 156.770,342.800 156.353 C 342.800 155.939,342.549 155.600,342.243 155.600 C 341.598 155.600,341.200 154.748,341.200 153.367 C 341.200 152.809,340.965 152.400,340.645 152.400 C 340.327 152.400,339.977 151.804,339.828 151.011 C 339.685 150.247,339.336 149.482,339.054 149.311 C 338.771 149.140,338.424 148.685,338.282 148.300 C 338.141 147.915,337.749 147.600,337.413 147.600 C 337.000 147.600,336.800 147.212,336.800 146.414 C 336.800 145.638,336.524 145.080,336.000 144.800 C 335.560 144.565,335.200 144.120,335.200 143.813 C 335.200 143.505,334.853 143.144,334.428 143.009 C 333.989 142.870,333.541 142.242,333.390 141.555 C 333.244 140.890,332.872 140.249,332.562 140.130 C 332.253 140.012,332.000 139.574,332.000 139.157 C 332.000 138.667,331.718 138.400,331.200 138.400 C 330.667 138.400,330.400 138.133,330.400 137.600 C 330.400 137.067,330.133 136.800,329.600 136.800 C 329.067 136.800,328.800 136.533,328.800 136.000 C 328.800 135.560,328.440 134.840,328.000 134.400 C 327.560 133.960,327.200 133.313,327.200 132.963 C 327.200 132.612,326.840 132.231,326.400 132.116 C 325.957 132.000,325.600 131.570,325.600 131.153 C 325.600 130.667,325.317 130.400,324.800 130.400 C 324.267 130.400,324.000 130.133,324.000 129.600 C 324.000 129.160,323.751 128.800,323.447 128.800 C 323.142 128.800,322.799 128.440,322.684 128.000 C 322.569 127.560,322.188 127.200,321.837 127.200 C 321.487 127.200,321.200 126.942,321.200 126.627 C 321.200 126.312,320.840 125.940,320.400 125.800 C 319.960 125.660,319.600 125.288,319.600 124.973 C 319.600 124.658,319.240 124.400,318.800 124.400 C 318.267 124.400,318.000 124.133,318.000 123.600 C 318.000 123.067,317.733 122.800,317.200 122.800 C 316.667 122.800,316.400 122.533,316.400 122.000 C 316.400 121.467,316.133 121.200,315.600 121.200 C 315.067 121.200,314.800 120.933,314.800 120.400 C 314.800 119.867,314.533 119.600,314.000 119.600 C 313.467 119.600,313.200 119.333,313.200 118.800 C 313.200 118.267,312.933 118.000,312.400 118.000 C 311.867 118.000,311.600 117.733,311.600 117.200 C 311.600 116.667,311.333 116.400,310.800 116.400 C 310.267 116.400,310.000 116.133,310.000 115.600 C 310.000 115.067,309.733 114.800,309.200 114.800 C 308.667 114.800,308.400 114.533,308.400 114.000 C 308.400 113.467,308.133 113.200,307.600 113.200 C 307.160 113.200,306.800 112.996,306.800 112.746 C 306.800 112.302,304.970 110.400,304.542 110.400 C 304.424 110.400,303.869 110.040,303.309 109.600 C 302.750 109.160,301.956 108.800,301.546 108.800 C 301.067 108.800,300.800 108.514,300.800 108.000 C 300.800 107.467,300.533 107.200,300.000 107.200 C 299.467 107.200,299.200 106.933,299.200 106.400 C 299.200 105.903,298.933 105.600,298.496 105.600 C 298.109 105.600,297.568 105.240,297.293 104.800 C 296.974 104.290,296.360 104.000,295.597 104.000 C 294.667 104.000,294.400 103.822,294.400 103.200 C 294.400 102.683,294.133 102.400,293.647 102.400 C 293.230 102.400,292.800 102.043,292.684 101.600 C 292.534 101.026,292.138 100.800,291.284 100.800 C 290.430 100.800,290.034 100.574,289.884 100.000 C 289.759 99.521,289.338 99.200,288.837 99.200 C 288.377 99.200,288.000 98.949,288.000 98.643 C 288.000 98.040,287.162 97.600,286.014 97.600 C 285.618 97.600,285.199 97.240,285.084 96.800 C 284.924 96.187,284.538 96.000,283.437 96.000 C 282.267 96.000,282.000 95.852,282.000 95.200 C 282.000 94.682,281.733 94.400,281.243 94.400 C 280.826 94.400,280.386 94.140,280.264 93.822 C 280.142 93.504,279.403 93.124,278.621 92.978 C 277.803 92.824,277.200 92.475,277.200 92.155 C 277.200 91.774,276.699 91.600,275.600 91.600 C 274.267 91.600,274.000 91.467,274.000 90.800 C 274.000 90.155,273.733 90.000,272.627 90.000 C 271.605 90.000,271.189 89.795,271.000 89.200 C 270.811 88.605,270.395 88.400,269.373 88.400 C 268.533 88.400,267.689 88.089,267.200 87.600 C 266.667 87.067,265.867 86.800,264.800 86.800 C 263.467 86.800,263.200 86.667,263.200 86.000 C 263.200 85.337,262.933 85.200,261.647 85.200 C 260.430 85.200,260.048 85.027,259.884 84.400 C 259.710 83.735,259.338 83.600,257.684 83.600 C 256.030 83.600,255.658 83.465,255.484 82.800 C 255.307 82.123,254.938 82.000,253.084 82.000 C 251.230 82.000,250.861 81.877,250.684 81.200 C 250.506 80.520,250.138 80.400,248.237 80.400 C 246.599 80.400,246.000 80.252,246.000 79.847 C 246.000 79.129,244.753 78.812,241.900 78.805 C 240.203 78.801,239.600 78.654,239.600 78.243 C 239.600 77.458,238.697 77.200,235.953 77.200 C 234.369 77.200,233.218 76.968,232.515 76.507 C 231.736 75.997,230.374 75.775,227.341 75.663 C 224.471 75.556,223.084 75.342,222.763 74.955 C 222.391 74.507,220.233 74.400,211.551 74.400 L 200.800 74.400 200.800 37.200 L 200.800 0.000 198.600 0.000 C 197.390 0.000,196.400 0.180,196.400 0.400 " stroke="none" fill="#000000" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ viewBox="0 0 8.4666665 8.4666669"
+ version="1.1"
+ id="svg1475"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="turn-left.svg">
+ <defs
+ id="defs1469" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8"
+ inkscape:cx="6.5156667"
+ inkscape:cy="9.3399563"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2020"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata1472">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-288.53332)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.79374999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 4.2333333,289.06248 -2.1166666,1.5875 2.1166666,1.5875 v -1.05833 A 2.1166664,2.1166664 0 0 1 6.35,293.29582 2.1166664,2.1166664 0 0 1 4.2333333,295.41248 2.1166664,2.1166664 0 0 1 2.1166667,293.29582 H 1.0583334 a 3.175,3.175 0 0 0 3.1749999,3.175 3.175,3.175 0 0 0 3.175,-3.175 3.175,3.175 0 0 0 -3.175,-3.175 z"
+ id="path2022"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/activities/programmingMaze/resource/turn-right.svg b/src/activities/programmingMaze/resource/turn-right.svg
index aaae8db9c..edf9e6726 100644
--- a/src/activities/programmingMaze/resource/turn-right.svg
+++ b/src/activities/programmingMaze/resource/turn-right.svg
@@ -1 +1,91 @@
-<svg id="svg" version="1.1" width="400" height="400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;"><g id="svgg"><path id="path0" d="M199.200 37.200 L 199.200 74.400 188.443 74.400 C 179.250 74.400,177.652 74.487,177.455 75.000 C 177.278 75.462,176.507 75.601,174.113 75.604 C 170.054 75.610,168.000 75.962,168.000 76.652 C 168.000 77.065,167.285 77.201,165.100 77.205 C 161.724 77.212,160.400 77.492,160.400 78.202 C 160.400 78.550,159.505 78.760,157.556 78.870 C 155.467 78.988,154.580 79.213,154.212 79.716 C 153.850 80.211,153.132 80.400,151.618 80.400 C 149.862 80.400,149.491 80.529,149.316 81.200 C 149.140 81.872,148.770 82.000,147.000 82.000 C 145.230 82.000,144.860 82.128,144.684 82.800 C 144.519 83.432,144.138 83.600,142.870 83.600 C 140.880 83.600,140.000 83.920,140.000 84.643 C 140.000 85.026,139.501 85.200,138.400 85.200 C 137.067 85.200,136.800 85.333,136.800 86.000 C 136.800 86.667,136.533 86.800,135.200 86.800 C 134.133 86.800,133.333 87.067,132.800 87.600 C 132.345 88.055,131.467 88.400,130.763 88.400 C 129.862 88.400,129.468 88.617,129.316 89.200 C 129.152 89.827,128.770 90.000,127.553 90.000 C 126.267 90.000,126.000 90.137,126.000 90.800 C 126.000 91.449,125.733 91.600,124.587 91.600 C 123.728 91.600,123.088 91.825,122.954 92.176 C 122.833 92.492,122.210 92.866,121.571 93.006 C 120.932 93.147,120.300 93.439,120.166 93.655 C 120.032 93.872,119.490 94.214,118.961 94.415 C 118.433 94.616,118.000 95.055,118.000 95.390 C 118.000 95.823,117.584 96.000,116.563 96.000 C 115.485 96.000,115.075 96.191,114.926 96.762 C 114.799 97.248,114.232 97.618,113.363 97.781 C 112.554 97.932,112.000 98.273,112.000 98.618 C 112.000 98.942,111.629 99.200,111.163 99.200 C 110.662 99.200,110.241 99.521,110.116 100.000 C 109.966 100.574,109.570 100.800,108.716 100.800 C 107.862 100.800,107.466 101.026,107.316 101.600 C 107.200 102.043,106.770 102.400,106.353 102.400 C 105.867 102.400,105.600 102.683,105.600 103.200 C 105.600 103.697,105.333 104.000,104.896 104.000 C 104.509 104.000,103.968 104.360,103.693 104.800 C 103.374 105.310,102.760 105.600,101.997 105.600 C 101.067 105.600,100.800 105.778,100.800 106.400 C 100.800 106.933,100.533 107.200,100.000 107.200 C 99.467 107.200,99.200 107.467,99.200 108.000 C 99.200 108.533,98.933 108.800,98.400 108.800 C 97.960 108.800,97.600 109.050,97.600 109.355 C 97.600 109.674,97.002 110.023,96.200 110.174 C 95.428 110.318,94.800 110.676,94.800 110.971 C 94.800 111.266,94.440 111.601,94.000 111.716 C 93.560 111.831,93.200 112.212,93.200 112.563 C 93.200 112.933,92.865 113.200,92.400 113.200 C 91.867 113.200,91.600 113.467,91.600 114.000 C 91.600 114.533,91.333 114.800,90.800 114.800 C 90.267 114.800,90.000 115.067,90.000 115.600 C 90.000 116.133,89.733 116.400,89.200 116.400 C 88.667 116.400,88.400 116.667,88.400 117.200 C 88.400 117.733,88.133 118.000,87.600 118.000 C 87.067 118.000,86.800 118.267,86.800 118.800 C 86.800 119.333,86.533 119.600,86.000 119.600 C 85.467 119.600,85.200 119.867,85.200 120.400 C 85.200 120.933,84.933 121.200,84.400 121.200 C 83.867 121.200,83.600 121.467,83.600 122.000 C 83.600 122.533,83.333 122.800,82.800 122.800 C 82.267 122.800,82.000 123.067,82.000 123.600 C 82.000 124.133,81.733 124.400,81.200 124.400 C 80.760 124.400,80.400 124.658,80.400 124.973 C 80.400 125.288,80.040 125.660,79.600 125.800 C 79.160 125.940,78.800 126.291,78.800 126.580 C 78.800 126.870,78.440 127.201,78.000 127.316 C 77.560 127.431,77.200 127.812,77.200 128.163 C 77.200 128.513,76.930 128.800,76.600 128.800 C 76.267 128.800,76.000 129.156,76.000 129.600 C 76.000 130.133,75.733 130.400,75.200 130.400 C 74.683 130.400,74.400 130.667,74.400 131.153 C 74.400 131.570,74.043 132.000,73.600 132.116 C 73.060 132.257,72.800 132.662,72.800 133.359 C 72.800 133.960,72.465 134.603,72.000 134.893 C 71.560 135.168,71.200 135.709,71.200 136.096 C 71.200 136.533,70.897 136.800,70.400 136.800 C 69.867 136.800,69.600 137.067,69.600 137.600 C 69.600 138.133,69.333 138.400,68.800 138.400 C 68.263 138.400,68.000 138.667,68.000 139.213 C 68.000 139.659,67.741 140.124,67.424 140.246 C 67.108 140.367,66.735 140.984,66.597 141.615 C 66.457 142.249,65.998 142.874,65.572 143.009 C 65.147 143.144,64.800 143.602,64.800 144.027 C 64.800 144.452,64.549 144.800,64.243 144.800 C 63.631 144.800,63.200 145.641,63.200 146.833 C 63.200 147.255,62.926 147.600,62.590 147.600 C 62.255 147.600,61.809 148.050,61.600 148.600 C 61.391 149.150,61.044 149.600,60.828 149.600 C 60.613 149.600,60.318 150.230,60.174 151.000 C 60.023 151.802,59.674 152.400,59.355 152.400 C 59.035 152.400,58.800 152.809,58.800 153.367 C 58.800 154.748,58.402 155.600,57.757 155.600 C 57.451 155.600,57.200 155.917,57.200 156.304 C 57.200 156.691,56.840 157.232,56.400 157.507 C 55.901 157.819,55.600 158.440,55.600 159.157 C 55.600 159.970,55.366 160.368,54.800 160.516 C 54.222 160.667,54.000 161.062,54.000 161.936 C 54.000 162.795,53.768 163.220,53.200 163.400 C 52.620 163.584,52.400 164.005,52.400 164.931 C 52.400 165.774,52.129 166.377,51.600 166.707 C 51.018 167.071,50.800 167.640,50.800 168.800 C 50.800 169.960,50.582 170.529,50.000 170.893 C 49.430 171.249,49.200 171.826,49.200 172.896 C 49.200 174.133,49.058 174.400,48.400 174.400 C 47.733 174.400,47.600 174.667,47.600 176.000 C 47.600 177.096,47.426 177.600,47.047 177.600 C 46.416 177.600,46.013 178.800,46.005 180.700 C 46.002 181.542,45.804 182.000,45.443 182.000 C 44.704 182.000,44.400 182.886,44.400 185.033 C 44.400 186.266,44.234 186.800,43.850 186.800 C 43.283 186.800,42.800 188.460,42.800 190.407 C 42.800 191.022,42.533 191.617,42.200 191.745 C 41.747 191.919,41.600 192.651,41.600 194.741 C 41.600 197.170,41.503 197.532,40.800 197.716 C 40.078 197.905,40.000 198.262,40.000 201.359 C 40.000 204.360,39.899 204.856,39.200 205.293 C 38.478 205.744,38.400 206.226,38.400 210.250 C 38.400 214.370,38.340 214.722,37.600 214.916 C 36.342 215.245,36.342 259.521,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.529 277.200,41.600 277.467,41.600 280.213 C 41.600 282.521,41.740 283.279,42.200 283.455 C 42.607 283.612,42.800 284.250,42.800 285.443 C 42.800 286.667,43.043 287.443,43.600 288.000 C 44.168 288.568,44.400 289.333,44.400 290.637 C 44.400 292.138,44.546 292.513,45.200 292.684 C 45.844 292.852,46.000 293.230,46.000 294.614 C 46.000 296.716,46.309 297.600,47.043 297.600 C 47.426 297.600,47.600 298.099,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.035 300.800,49.201 301.068,49.205 302.100 C 49.213 304.000,49.616 305.200,50.247 305.200 C 50.615 305.200,50.800 305.680,50.800 306.637 C 50.800 307.738,50.987 308.124,51.600 308.284 C 52.227 308.448,52.400 308.830,52.400 310.047 C 52.400 311.333,52.537 311.600,53.200 311.600 C 53.852 311.600,54.000 311.867,54.000 313.037 C 54.000 314.138,54.187 314.524,54.800 314.684 C 55.397 314.840,55.600 315.230,55.600 316.220 C 55.600 317.195,55.812 317.613,56.400 317.800 C 56.840 317.940,57.200 318.402,57.200 318.827 C 57.200 319.252,57.451 319.600,57.757 319.600 C 58.371 319.600,58.800 320.441,58.800 321.645 C 58.800 322.074,59.065 322.527,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 63.052 327.200,63.200 327.467,63.200 328.637 C 63.200 329.738,63.387 330.124,64.000 330.284 C 64.443 330.400,64.800 330.830,64.800 331.247 C 64.800 331.733,65.083 332.000,65.600 332.000 C 66.224 332.000,66.400 332.267,66.400 333.213 C 66.400 333.948,66.648 334.520,67.031 334.667 C 67.377 334.800,67.823 335.335,68.021 335.855 C 68.218 336.375,68.655 336.800,68.990 336.800 C 69.333 336.800,69.600 337.150,69.600 337.600 C 69.600 338.133,69.867 338.400,70.400 338.400 C 70.933 338.400,71.200 338.667,71.200 339.200 C 71.200 339.640,71.560 340.360,72.000 340.800 C 72.440 341.240,72.800 341.870,72.800 342.200 C 72.800 342.533,73.156 342.800,73.600 342.800 C 74.133 342.800,74.400 343.067,74.400 343.600 C 74.400 344.040,74.658 344.400,74.973 344.400 C 75.288 344.400,75.660 344.760,75.800 345.200 C 75.940 345.640,76.312 346.000,76.627 346.000 C 76.942 346.000,77.200 346.360,77.200 346.800 C 77.200 347.333,77.467 347.600,78.000 347.600 C 78.533 347.600,78.800 347.867,78.800 348.400 C 78.800 348.933,79.067 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.317 360.000,91.600 360.267,91.600 360.753 C 91.600 361.170,91.957 361.600,92.400 361.716 C 92.840 361.831,93.200 362.212,93.200 362.563 C 93.200 362.913,93.458 363.200,93.773 363.200 C 94.088 363.200,94.460 363.560,94.600 364.000 C 94.740 364.440,95.202 364.800,95.627 364.800 C 96.052 364.800,96.400 365.062,96.400 365.382 C 96.400 365.730,96.962 366.069,97.800 366.226 C 98.813 366.416,99.200 366.698,99.200 367.245 C 99.200 367.733,99.482 368.000,100.000 368.000 C 100.533 368.000,100.800 368.267,100.800 368.800 C 100.800 369.318,101.067 369.600,101.557 369.600 C 101.974 369.600,102.414 369.860,102.536 370.178 C 102.658 370.496,103.397 370.876,104.179 371.022 C 105.211 371.216,105.600 371.496,105.600 372.045 C 105.600 372.533,105.882 372.800,106.400 372.800 C 106.840 372.800,107.200 373.050,107.200 373.355 C 107.200 373.674,107.798 374.023,108.600 374.174 C 109.438 374.331,110.000 374.670,110.000 375.018 C 110.000 375.338,110.348 375.600,110.773 375.600 C 111.198 375.600,111.660 375.960,111.800 376.400 C 111.989 376.995,112.405 377.200,113.427 377.200 C 114.533 377.200,114.800 377.355,114.800 378.000 C 114.800 378.622,115.067 378.800,115.997 378.800 C 116.760 378.800,117.374 379.090,117.693 379.600 C 117.968 380.040,118.488 380.400,118.850 380.400 C 119.211 380.400,119.601 380.760,119.716 381.200 C 119.876 381.813,120.262 382.000,121.363 382.000 C 122.533 382.000,122.800 382.148,122.800 382.800 C 122.800 383.467,123.067 383.600,124.400 383.600 C 125.733 383.600,126.000 383.733,126.000 384.400 C 126.000 385.045,126.267 385.200,127.373 385.200 C 128.395 385.200,128.811 385.405,129.000 386.000 C 129.187 386.589,129.605 386.800,130.584 386.800 C 131.375 386.800,132.004 387.034,132.136 387.378 C 132.258 387.696,133.042 388.082,133.879 388.236 C 134.716 388.390,135.829 388.850,136.354 389.258 C 136.879 389.666,137.914 390.000,138.654 390.000 C 139.528 390.000,140.000 390.192,140.000 390.549 C 140.000 390.918,140.675 391.163,142.054 391.296 C 143.383 391.423,144.238 391.724,144.474 392.146 C 144.743 392.627,145.419 392.800,147.020 392.800 C 148.933 392.800,149.200 392.898,149.200 393.600 C 149.200 394.311,149.467 394.400,151.600 394.400 C 153.733 394.400,154.000 394.489,154.000 395.200 C 154.000 395.928,154.267 396.000,156.973 396.000 C 159.595 396.000,159.976 396.095,160.200 396.800 C 160.423 397.504,160.805 397.600,163.380 397.600 C 165.970 397.600,166.331 397.692,166.516 398.400 C 166.710 399.142,167.062 399.200,171.363 399.200 C 174.188 399.200,176.000 399.356,176.000 399.600 C 176.000 399.862,184.267 400.000,200.000 400.000 C 215.733 400.000,224.000 399.862,224.000 399.600 C 224.000 399.356,225.812 399.200,228.637 399.200 C 232.938 399.200,233.290 399.142,233.484 398.400 C 233.671 397.685,234.030 397.600,236.843 397.600 C 239.560 397.600,240.062 397.490,240.493 396.800 C 240.906 396.138,241.426 396.000,243.496 396.000 C 245.733 396.000,246.000 395.915,246.000 395.200 C 246.000 394.489,246.267 394.400,248.400 394.400 C 250.267 394.400,250.978 394.222,251.600 393.600 C 252.107 393.093,252.933 392.800,253.856 392.800 C 254.729 392.800,255.499 392.544,255.780 392.159 C 256.043 391.800,257.073 391.426,258.124 391.307 C 259.239 391.182,260.000 390.894,260.000 390.599 C 260.000 390.293,260.790 390.026,262.054 389.904 C 263.383 389.777,264.238 389.476,264.474 389.054 C 264.675 388.694,265.266 388.400,265.787 388.400 C 267.149 388.400,268.000 387.999,268.000 387.357 C 268.000 386.984,268.475 386.800,269.437 386.800 C 270.538 386.800,270.924 386.613,271.084 386.000 C 271.241 385.399,271.630 385.200,272.647 385.200 C 273.733 385.200,274.000 385.042,274.000 384.400 C 274.000 383.733,274.267 383.600,275.600 383.600 C 276.933 383.600,277.200 383.467,277.200 382.800 C 277.200 382.133,277.467 382.000,278.800 382.000 C 280.133 382.000,280.400 381.867,280.400 381.200 C 280.400 380.578,280.667 380.400,281.597 380.400 C 282.360 380.400,282.974 380.110,283.293 379.600 C 283.568 379.160,284.109 378.800,284.496 378.800 C 284.933 378.800,285.200 378.497,285.200 378.000 C 285.200 377.348,285.467 377.200,286.637 377.200 C 287.738 377.200,288.124 377.013,288.284 376.400 C 288.400 375.955,288.830 375.600,289.251 375.600 C 289.667 375.600,290.316 375.240,290.693 374.800 C 291.070 374.360,291.698 374.000,292.089 374.000 C 292.480 374.000,292.800 373.730,292.800 373.400 C 292.800 373.067,293.156 372.800,293.600 372.800 C 294.133 372.800,294.400 372.533,294.400 372.000 C 294.400 371.421,294.667 371.200,295.367 371.200 C 296.748 371.200,297.600 370.802,297.600 370.157 C 297.600 369.851,297.960 369.600,298.400 369.600 C 298.933 369.600,299.200 369.333,299.200 368.800 C 299.200 368.267,299.467 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.576,301.067 366.400,302.013 366.400 C 302.748 366.400,303.320 366.152,303.467 365.769 C 303.600 365.423,304.135 364.977,304.655 364.779 C 305.175 364.582,305.600 364.166,305.600 363.857 C 305.600 363.547,305.960 363.199,306.400 363.084 C 306.840 362.969,307.200 362.588,307.200 362.237 C 307.200 361.887,307.470 361.600,307.800 361.600 C 308.133 361.600,308.400 361.244,308.400 360.800 C 308.400 360.267,308.667 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.232,311.600 358.027 C 311.600 357.822,311.916 357.554,312.302 357.431 C 313.725 356.979,321.200 349.174,321.200 348.139 C 321.200 347.843,321.560 347.600,322.000 347.600 C 322.533 347.600,322.800 347.333,322.800 346.800 C 322.800 346.360,323.058 346.000,323.373 346.000 C 323.688 346.000,324.060 345.640,324.200 345.200 C 324.340 344.760,324.712 344.400,325.027 344.400 C 325.342 344.400,325.600 344.040,325.600 343.600 C 325.600 343.067,325.867 342.800,326.400 342.800 C 326.933 342.800,327.200 342.533,327.200 342.000 C 327.200 341.467,327.467 341.200,328.000 341.200 C 328.648 341.200,328.800 340.933,328.800 339.800 C 328.800 338.667,328.952 338.400,329.600 338.400 C 330.133 338.400,330.400 338.133,330.400 337.600 C 330.400 337.067,330.667 336.800,331.200 336.800 C 331.717 336.800,332.000 336.533,332.000 336.047 C 332.000 335.630,332.357 335.200,332.800 335.084 C 333.413 334.924,333.600 334.538,333.600 333.437 C 333.600 332.267,333.748 332.000,334.400 332.000 C 334.917 332.000,335.200 331.733,335.200 331.247 C 335.200 330.830,335.557 330.400,336.000 330.284 C 336.540 330.143,336.800 329.738,336.800 329.041 C 336.800 328.440,337.135 327.797,337.600 327.507 C 338.040 327.232,338.400 326.691,338.400 326.304 C 338.400 325.917,338.662 325.600,338.982 325.600 C 339.330 325.600,339.669 325.038,339.826 324.200 C 339.977 323.398,340.326 322.800,340.645 322.800 C 340.950 322.800,341.200 322.446,341.200 322.014 C 341.200 321.582,341.560 321.035,342.000 320.800 C 342.513 320.526,342.800 319.962,342.800 319.233 C 342.800 318.430,343.036 318.032,343.600 317.884 C 344.213 317.724,344.400 317.338,344.400 316.237 C 344.400 315.067,344.548 314.800,345.200 314.800 C 345.867 314.800,346.000 314.533,346.000 313.200 C 346.000 311.867,346.133 311.600,346.800 311.600 C 347.467 311.600,347.600 311.333,347.600 310.000 C 347.600 308.667,347.733 308.400,348.400 308.400 C 349.052 308.400,349.200 308.133,349.200 306.963 C 349.200 305.862,349.387 305.476,350.000 305.316 C 350.601 305.159,350.800 304.770,350.800 303.753 C 350.800 302.933,351.115 302.085,351.600 301.600 C 352.125 301.075,352.400 300.267,352.400 299.247 C 352.400 298.030,352.573 297.648,353.200 297.484 C 353.853 297.313,354.000 296.938,354.000 295.441 C 354.000 294.040,354.189 293.489,354.800 293.107 C 355.409 292.727,355.600 292.174,355.600 290.793 C 355.600 289.473,355.818 288.791,356.400 288.293 C 357.002 287.777,357.200 287.113,357.200 285.604 C 357.200 284.089,357.347 283.600,357.800 283.600 C 358.267 283.600,358.400 283.067,358.400 281.200 C 358.400 279.333,358.578 278.622,359.200 278.000 C 359.856 277.344,360.000 276.667,360.000 274.247 C 360.000 271.630,360.091 271.269,360.800 271.084 C 361.542 270.890,361.600 270.538,361.600 266.237 C 361.600 261.867,361.646 261.600,362.400 261.600 C 363.175 261.600,363.200 261.333,363.200 253.020 C 363.200 245.264,363.267 244.402,363.900 244.048 C 364.462 243.733,364.628 242.982,364.741 240.228 L 364.882 236.800 338.241 236.800 L 311.600 236.800 311.600 239.469 C 311.600 241.449,311.419 242.336,310.900 242.910 C 310.316 243.554,310.177 244.652,310.061 249.526 C 309.962 253.669,309.771 255.490,309.406 255.785 C 309.096 256.035,308.807 257.537,308.679 259.565 C 308.522 262.060,308.303 263.023,307.833 263.285 C 307.344 263.559,307.200 264.317,307.200 266.620 C 307.200 269.333,307.128 269.600,306.400 269.600 C 305.689 269.600,305.600 269.867,305.600 272.000 C 305.600 274.133,305.511 274.400,304.800 274.400 C 304.137 274.400,304.000 274.667,304.000 275.953 C 304.000 277.170,303.827 277.552,303.200 277.716 C 302.532 277.891,302.400 278.262,302.400 279.963 C 302.400 281.733,302.295 282.000,301.600 282.000 C 300.933 282.000,300.800 282.267,300.800 283.600 C 300.800 284.933,300.667 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.733 288.400,297.600 288.667,297.600 290.000 C 297.600 291.333,297.467 291.600,296.800 291.600 C 296.282 291.600,296.000 291.867,296.000 292.357 C 296.000 292.774,295.747 293.212,295.438 293.330 C 295.128 293.449,294.754 294.098,294.606 294.773 C 294.458 295.448,294.097 296.000,293.803 296.000 C 293.493 296.000,293.157 296.669,293.000 297.600 C 292.834 298.584,292.512 299.200,292.165 299.200 C 291.854 299.200,291.600 299.560,291.600 300.000 C 291.600 300.533,291.333 300.800,290.800 300.800 C 290.271 300.800,290.000 301.067,290.000 301.586 C 290.000 302.018,289.640 302.565,289.200 302.800 C 288.676 303.080,288.400 303.638,288.400 304.414 C 288.400 305.333,288.220 305.600,287.600 305.600 C 287.067 305.600,286.800 305.867,286.800 306.400 C 286.800 306.933,286.533 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.867 308.800,283.600 309.067,283.600 309.600 C 283.600 310.052,283.333 310.400,282.987 310.400 C 282.651 310.400,282.263 310.692,282.126 311.050 C 281.989 311.407,281.186 312.442,280.343 313.350 C 279.500 314.257,278.808 315.315,278.805 315.700 C 278.802 316.132,278.493 316.400,278.000 316.400 C 277.544 316.400,277.200 316.667,277.200 317.021 C 277.200 317.362,276.660 317.830,276.000 318.060 C 275.340 318.290,274.800 318.645,274.800 318.849 C 274.800 319.053,274.350 319.391,273.800 319.600 C 273.250 319.809,272.800 320.255,272.800 320.590 C 272.800 320.933,272.450 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.133,269.333 324.400,268.800 324.400 C 268.360 324.400,268.000 324.656,268.000 324.968 C 268.000 325.281,267.448 325.658,266.773 325.806 C 266.098 325.954,265.455 326.312,265.344 326.602 C 265.233 326.891,264.705 327.237,264.171 327.372 C 263.637 327.506,263.200 327.861,263.200 328.161 C 263.200 328.461,262.840 328.801,262.400 328.916 C 261.960 329.031,261.600 329.412,261.600 329.763 C 261.600 330.224,261.214 330.400,260.200 330.400 C 259.094 330.400,258.800 330.559,258.800 331.155 C 258.800 331.704,258.411 331.984,257.379 332.178 C 256.597 332.324,255.858 332.704,255.736 333.022 C 255.614 333.340,255.174 333.600,254.757 333.600 C 254.267 333.600,254.000 333.882,254.000 334.400 C 254.000 335.067,253.733 335.200,252.400 335.200 C 251.067 335.200,250.800 335.333,250.800 336.000 C 250.800 336.667,250.533 336.800,249.200 336.800 C 247.867 336.800,247.600 336.933,247.600 337.600 C 247.600 338.252,247.333 338.400,246.163 338.400 C 245.062 338.400,244.676 338.587,244.516 339.200 C 244.342 339.865,243.970 340.000,242.316 340.000 C 240.662 340.000,240.290 340.135,240.116 340.800 C 239.952 341.427,239.570 341.600,238.353 341.600 C 237.239 341.600,236.800 341.770,236.800 342.200 C 236.800 342.643,236.337 342.800,235.033 342.800 C 232.886 342.800,232.000 343.104,232.000 343.843 C 232.000 344.256,231.389 344.400,229.633 344.400 C 226.940 344.400,226.000 344.659,226.000 345.403 C 226.000 345.778,225.000 345.959,222.368 346.060 C 219.478 346.171,218.630 346.343,218.223 346.900 C 217.776 347.512,216.970 347.600,211.818 347.600 C 206.262 347.600,205.913 347.646,205.716 348.400 C 205.519 349.151,205.170 349.200,200.000 349.200 C 194.830 349.200,194.481 349.151,194.284 348.400 C 194.087 347.646,193.738 347.600,188.237 347.600 C 182.933 347.600,182.327 347.527,181.600 346.800 C 180.925 346.125,180.267 346.000,177.400 346.000 C 174.761 346.000,174.000 345.875,174.000 345.443 C 174.000 344.679,173.105 344.400,170.656 344.400 C 169.073 344.400,168.415 344.209,167.893 343.600 C 167.423 343.051,166.713 342.800,165.632 342.800 C 164.766 342.800,163.787 342.530,163.457 342.200 C 163.127 341.870,162.214 341.600,161.429 341.600 C 160.267 341.600,160.000 341.451,160.000 340.800 C 160.000 340.119,159.733 340.000,158.203 340.000 C 156.840 340.000,156.286 339.807,155.907 339.200 C 155.551 338.630,154.974 338.400,153.904 338.400 C 152.667 338.400,152.400 338.258,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.333,148.933 335.200,147.600 335.200 C 146.267 335.200,146.000 335.067,146.000 334.400 C 146.000 333.867,145.733 333.600,145.200 333.600 C 144.760 333.600,144.400 333.349,144.400 333.043 C 144.400 332.398,143.548 332.000,142.167 332.000 C 141.467 332.000,141.200 331.779,141.200 331.200 C 141.200 330.667,140.933 330.400,140.400 330.400 C 139.960 330.400,139.240 330.040,138.800 329.600 C 138.360 329.160,137.730 328.800,137.400 328.800 C 137.070 328.800,136.800 328.526,136.800 328.190 C 136.800 327.855,136.350 327.409,135.800 327.200 C 135.250 326.991,134.800 326.655,134.800 326.454 C 134.800 326.253,134.170 325.971,133.400 325.826 C 132.562 325.669,132.000 325.330,132.000 324.982 C 132.000 324.662,131.640 324.400,131.200 324.400 C 130.667 324.400,130.400 324.133,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.935 319.600,125.600 319.333,125.600 318.963 C 125.600 318.612,125.240 318.231,124.800 318.116 C 124.360 318.001,124.000 317.658,124.000 317.353 C 124.000 317.049,123.852 316.800,123.672 316.800 C 123.141 316.800,120.800 314.570,120.800 314.064 C 120.800 313.809,120.542 313.600,120.227 313.600 C 119.912 313.600,119.540 313.240,119.400 312.800 C 119.260 312.360,118.888 312.000,118.573 312.000 C 118.258 312.000,118.000 311.661,118.000 311.247 C 118.000 310.830,117.643 310.400,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.467 307.200,113.200 306.933,113.200 306.400 C 113.200 305.867,112.933 305.600,112.400 305.600 C 111.748 305.600,111.600 305.333,111.600 304.163 C 111.600 303.062,111.413 302.676,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.576 300.800,108.400 300.533,108.400 299.587 C 108.400 298.913,108.150 298.279,107.836 298.159 C 107.526 298.039,107.163 297.505,107.028 296.971 C 106.894 296.437,106.538 296.000,106.237 296.000 C 105.927 296.000,105.575 295.391,105.426 294.600 C 105.269 293.762,104.930 293.200,104.582 293.200 C 104.262 293.200,104.000 292.874,104.000 292.475 C 104.000 292.077,103.640 291.364,103.200 290.892 C 102.760 290.420,102.400 289.666,102.400 289.217 C 102.400 288.667,102.139 288.400,101.600 288.400 C 100.933 288.400,100.800 288.133,100.800 286.800 C 100.800 285.467,100.667 285.200,100.000 285.200 C 99.333 285.200,99.200 284.933,99.200 283.600 C 99.200 282.533,98.933 281.733,98.400 281.200 C 97.911 280.711,97.600 279.867,97.600 279.027 C 97.600 278.005,97.395 277.589,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.523 272.739,94.400 272.370,94.400 270.516 C 94.400 268.662,94.277 268.293,93.600 268.116 C 92.916 267.937,92.800 267.570,92.800 265.582 C 92.800 263.998,92.599 263.056,92.169 262.626 C 91.756 262.213,91.457 260.928,91.304 258.904 C 91.172 257.152,90.839 255.581,90.535 255.278 C 89.583 254.326,89.645 221.098,90.600 220.143 C 90.865 219.878,91.181 218.212,91.302 216.441 C 91.452 214.262,91.730 213.013,92.161 212.581 C 92.614 212.129,92.800 211.193,92.800 209.371 C 92.800 207.067,92.883 206.800,93.600 206.800 C 94.302 206.800,94.400 206.533,94.400 204.627 C 94.400 202.805,94.529 202.413,95.200 202.200 C 95.871 201.987,96.000 201.595,96.000 199.773 C 96.000 197.867,96.098 197.600,96.800 197.600 C 97.463 197.600,97.600 197.333,97.600 196.047 C 97.600 194.830,97.773 194.448,98.400 194.284 C 99.052 194.113,99.200 193.738,99.200 192.252 C 99.200 190.838,99.380 190.332,100.000 190.000 C 100.440 189.765,100.800 189.246,100.800 188.848 C 100.800 188.450,101.160 187.798,101.600 187.400 C 102.040 187.002,102.400 186.254,102.400 185.738 C 102.400 185.184,102.638 184.800,102.982 184.800 C 103.330 184.800,103.669 184.238,103.826 183.400 C 103.971 182.630,104.320 182.000,104.602 182.000 C 105.199 182.000,105.600 181.121,105.600 179.814 C 105.600 179.230,105.892 178.817,106.400 178.684 C 106.840 178.569,107.200 178.188,107.200 177.837 C 107.200 177.487,107.470 177.200,107.800 177.200 C 108.217 177.200,108.400 176.781,108.400 175.827 C 108.400 174.805,108.605 174.389,109.200 174.200 C 109.640 174.060,110.000 173.700,110.000 173.400 C 110.000 173.100,110.360 172.740,110.800 172.600 C 111.240 172.460,111.600 172.088,111.600 171.773 C 111.600 171.458,111.960 170.840,112.400 170.400 C 112.840 169.960,113.200 169.240,113.200 168.800 C 113.200 168.267,113.467 168.000,114.000 168.000 C 114.533 168.000,114.800 167.733,114.800 167.200 C 114.800 166.667,115.067 166.400,115.600 166.400 C 116.133 166.400,116.400 166.133,116.400 165.600 C 116.400 165.067,116.667 164.800,117.200 164.800 C 117.717 164.800,118.000 164.533,118.000 164.047 C 118.000 163.630,118.357 163.200,118.800 163.084 C 119.240 162.969,119.600 162.588,119.600 162.237 C 119.600 161.887,119.858 161.600,120.173 161.600 C 120.488 161.600,120.860 161.240,121.000 160.800 C 121.140 160.360,121.512 160.000,121.827 160.000 C 122.142 160.000,122.400 159.640,122.400 159.200 C 122.400 158.667,122.667 158.400,123.200 158.400 C 123.665 158.400,124.000 158.133,124.000 157.763 C 124.000 157.412,124.360 157.031,124.800 156.916 C 125.240 156.801,125.600 156.479,125.600 156.200 C 125.600 155.921,125.960 155.599,126.400 155.484 C 126.840 155.369,127.200 154.988,127.200 154.637 C 127.200 154.267,127.535 154.000,128.000 154.000 C 128.533 154.000,128.800 153.733,128.800 153.200 C 128.800 152.667,129.067 152.400,129.600 152.400 C 130.133 152.400,130.400 152.133,130.400 151.600 C 130.400 151.067,130.667 150.800,131.200 150.800 C 131.640 150.800,132.360 150.440,132.800 150.000 C 133.240 149.560,133.887 149.200,134.237 149.200 C 134.588 149.200,134.969 148.840,135.084 148.400 C 135.200 147.957,135.630 147.600,136.047 147.600 C 136.533 147.600,136.800 147.317,136.800 146.800 C 136.800 146.172,137.067 146.000,138.037 146.000 C 138.938 146.000,139.332 145.783,139.484 145.200 C 139.600 144.757,140.030 144.400,140.447 144.400 C 140.933 144.400,141.200 144.117,141.200 143.600 C 141.200 142.933,141.467 142.800,142.800 142.800 C 144.133 142.800,144.400 142.667,144.400 142.000 C 144.400 141.352,144.667 141.200,145.800 141.200 C 146.570 141.200,147.200 141.022,147.200 140.805 C 147.200 140.588,147.808 140.157,148.551 139.846 C 149.294 139.536,150.025 139.083,150.175 138.841 C 150.325 138.598,150.790 138.400,151.210 138.400 C 151.629 138.400,152.165 138.040,152.400 137.600 C 152.699 137.042,153.238 136.800,154.181 136.800 C 155.930 136.800,156.800 136.454,156.800 135.757 C 156.800 135.374,157.299 135.200,158.400 135.200 C 159.733 135.200,160.000 135.067,160.000 134.400 C 160.000 133.695,160.267 133.600,162.237 133.600 C 164.138 133.600,164.506 133.480,164.684 132.800 C 164.860 132.127,165.230 132.000,167.020 132.000 C 168.795 132.000,169.188 131.868,169.400 131.200 C 169.619 130.509,170.005 130.400,172.224 130.400 C 174.360 130.400,174.877 130.265,175.293 129.600 C 175.723 128.912,176.226 128.800,178.896 128.800 C 181.467 128.800,182.137 128.663,182.800 128.000 C 183.545 127.255,184.133 127.200,191.400 127.200 L 199.200 127.200 199.200 164.000 L 199.200 200.800 201.373 200.800 C 203.153 200.800,203.589 200.663,203.786 200.043 C 203.918 199.627,204.381 199.194,204.813 199.081 C 205.246 198.967,205.600 198.609,205.600 198.284 C 205.600 197.959,205.960 197.599,206.400 197.484 C 206.840 197.369,207.200 196.988,207.200 196.637 C 207.200 196.287,207.430 196.000,207.712 196.000 C 207.993 196.000,208.483 195.640,208.800 195.200 C 209.139 194.730,209.835 194.400,210.488 194.400 C 211.333 194.400,211.600 194.208,211.600 193.600 C 211.600 193.067,211.867 192.800,212.400 192.800 C 212.933 192.800,213.200 192.533,213.200 192.000 C 213.200 191.467,213.467 191.200,214.000 191.200 C 214.444 191.200,214.800 190.933,214.800 190.600 C 214.800 190.270,215.064 190.000,215.386 190.000 C 215.708 190.000,216.165 189.640,216.400 189.200 C 216.635 188.760,217.182 188.400,217.614 188.400 C 218.046 188.400,218.729 188.071,219.131 187.669 C 219.532 187.268,220.162 186.823,220.531 186.682 C 220.899 186.541,221.200 186.170,221.200 185.859 C 221.200 185.548,221.560 185.199,222.000 185.084 C 222.440 184.969,222.800 184.588,222.800 184.237 C 222.800 183.887,223.064 183.600,223.386 183.600 C 223.708 183.600,224.165 183.240,224.400 182.800 C 224.680 182.276,225.238 182.000,226.014 182.000 C 226.933 182.000,227.200 181.820,227.200 181.200 C 227.200 180.667,227.467 180.400,228.000 180.400 C 228.533 180.400,228.800 180.133,228.800 179.600 C 228.800 179.067,229.067 178.800,229.600 178.800 C 230.133 178.800,230.400 178.533,230.400 178.000 C 230.400 177.467,230.667 177.200,231.200 177.200 C 231.640 177.200,232.360 176.840,232.800 176.400 C 233.240 175.960,233.887 175.600,234.237 175.600 C 234.588 175.600,234.969 175.240,235.084 174.800 C 235.200 174.357,235.630 174.000,236.047 174.000 C 236.461 174.000,236.800 173.751,236.800 173.447 C 236.800 173.142,237.160 172.799,237.600 172.684 C 238.040 172.569,238.400 172.188,238.400 171.837 C 238.400 171.487,238.636 171.200,238.925 171.200 C 239.213 171.200,239.836 170.840,240.308 170.400 C 240.780 169.960,241.461 169.600,241.821 169.600 C 242.181 169.600,242.569 169.240,242.684 168.800 C 242.800 168.357,243.230 168.000,243.647 168.000 C 244.133 168.000,244.400 167.717,244.400 167.200 C 244.400 166.667,244.667 166.400,245.200 166.400 C 245.733 166.400,246.000 166.133,246.000 165.600 C 246.000 165.067,246.267 164.800,246.800 164.800 C 247.240 164.800,247.960 164.440,248.400 164.000 C 248.840 163.560,249.487 163.200,249.837 163.200 C 250.188 163.200,250.569 162.840,250.684 162.400 C 250.800 161.957,251.230 161.600,251.647 161.600 C 252.133 161.600,252.400 161.317,252.400 160.800 C 252.400 160.267,252.667 160.000,253.200 160.000 C 253.733 160.000,254.000 159.733,254.000 159.200 C 254.000 158.665,254.267 158.400,254.804 158.400 C 255.246 158.400,255.916 158.040,256.293 157.600 C 256.670 157.160,257.298 156.800,257.689 156.800 C 258.080 156.800,258.400 156.551,258.400 156.247 C 258.400 155.942,258.760 155.599,259.200 155.484 C 259.640 155.369,260.000 154.988,260.000 154.637 C 260.000 154.267,260.335 154.000,260.800 154.000 C 261.333 154.000,261.600 153.733,261.600 153.200 C 261.600 152.703,261.867 152.400,262.304 152.400 C 262.691 152.400,263.232 152.040,263.507 151.600 C 263.797 151.135,264.440 150.800,265.041 150.800 C 265.738 150.800,266.143 150.540,266.284 150.000 C 266.400 149.557,266.830 149.200,267.247 149.200 C 267.733 149.200,268.000 148.917,268.000 148.400 C 268.000 147.867,268.267 147.600,268.800 147.600 C 269.333 147.600,269.600 147.333,269.600 146.800 C 269.600 146.303,269.867 146.000,270.304 146.000 C 270.691 146.000,271.232 145.640,271.507 145.200 C 271.790 144.748,272.440 144.400,273.003 144.400 C 273.733 144.400,274.000 144.186,274.000 143.600 C 274.000 143.067,274.267 142.800,274.800 142.800 C 275.333 142.800,275.600 142.533,275.600 142.000 C 275.600 141.467,275.867 141.200,276.400 141.200 C 276.844 141.200,277.200 140.933,277.200 140.600 C 277.200 140.270,277.517 140.000,277.904 140.000 C 278.291 140.000,278.822 139.656,279.085 139.236 C 279.347 138.816,280.110 138.351,280.781 138.204 C 281.451 138.057,282.000 137.681,282.000 137.368 C 282.000 137.056,282.287 136.800,282.637 136.800 C 282.988 136.800,283.369 136.440,283.484 136.000 C 283.600 135.557,284.030 135.200,284.447 135.200 C 284.933 135.200,285.200 134.917,285.200 134.400 C 285.200 133.903,285.467 133.600,285.904 133.600 C 286.291 133.600,286.832 133.240,287.107 132.800 C 287.390 132.348,288.040 132.000,288.603 132.000 C 289.333 132.000,289.600 131.786,289.600 131.200 C 289.600 130.667,289.867 130.400,290.400 130.400 C 290.933 130.400,291.200 130.133,291.200 129.600 C 291.200 129.067,291.467 128.800,292.000 128.800 C 292.533 128.800,292.800 128.533,292.800 128.000 C 292.800 127.500,293.067 127.200,293.512 127.200 C 293.903 127.200,294.483 126.840,294.800 126.400 C 295.139 125.930,295.835 125.600,296.488 125.600 C 297.333 125.600,297.600 125.408,297.600 124.800 C 297.600 124.267,297.867 124.000,298.400 124.000 C 298.844 124.000,299.200 123.733,299.200 123.400 C 299.200 123.070,299.487 122.800,299.837 122.800 C 300.188 122.800,300.569 122.440,300.684 122.000 C 300.799 121.560,301.204 121.200,301.585 121.200 C 301.965 121.200,302.602 120.840,303.000 120.400 C 303.398 119.960,303.960 119.600,304.248 119.600 C 304.536 119.600,304.965 119.240,305.200 118.800 C 305.435 118.360,305.880 118.000,306.187 118.000 C 306.495 118.000,306.860 117.640,307.000 117.200 C 307.140 116.760,307.512 116.400,307.827 116.400 C 308.142 116.400,308.400 116.040,308.400 115.600 C 308.400 115.067,308.667 114.800,309.200 114.800 C 309.640 114.800,310.360 114.440,310.800 114.000 C 311.240 113.560,311.887 113.200,312.237 113.200 C 312.588 113.200,312.969 112.840,313.084 112.400 C 313.200 111.957,313.630 111.600,314.047 111.600 C 314.533 111.600,314.800 111.317,314.800 110.800 C 314.800 110.267,315.067 110.000,315.600 110.000 C 316.133 110.000,316.400 109.733,316.400 109.200 C 316.400 108.682,316.667 108.400,317.157 108.400 C 317.574 108.400,318.012 108.147,318.130 107.838 C 318.249 107.528,318.883 107.157,319.540 107.013 C 320.196 106.869,320.833 106.492,320.954 106.176 C 321.076 105.859,321.438 105.600,321.760 105.600 C 322.083 105.600,322.460 105.240,322.600 104.800 C 322.740 104.360,323.100 104.000,323.400 104.000 C 323.700 104.000,324.048 103.680,324.172 103.288 C 324.296 102.897,324.938 102.372,325.599 102.123 C 326.905 101.630,327.277 100.158,326.200 99.745 C 325.870 99.618,325.600 99.105,325.600 98.604 C 325.600 98.030,325.304 97.616,324.800 97.484 C 324.360 97.369,324.000 96.988,324.000 96.637 C 324.000 96.287,323.773 96.000,323.496 96.000 C 323.219 96.000,322.768 95.640,322.493 95.200 C 322.218 94.760,321.725 94.400,321.397 94.400 C 321.068 94.400,320.800 94.150,320.800 93.845 C 320.800 93.526,320.202 93.177,319.400 93.026 C 318.562 92.869,318.000 92.530,318.000 92.182 C 318.000 91.862,317.640 91.600,317.200 91.600 C 316.667 91.600,316.400 91.333,316.400 90.800 C 316.400 90.267,316.133 90.000,315.600 90.000 C 315.067 90.000,314.800 89.733,314.800 89.200 C 314.800 88.683,314.533 88.400,314.047 88.400 C 313.630 88.400,313.200 88.043,313.084 87.600 C 312.924 86.987,312.538 86.800,311.437 86.800 C 310.267 86.800,310.000 86.652,310.000 86.000 C 310.000 85.467,309.733 85.200,309.200 85.200 C 308.683 85.200,308.400 84.933,308.400 84.447 C 308.400 84.030,308.043 83.600,307.600 83.484 C 307.160 83.369,306.800 82.988,306.800 82.637 C 306.800 82.267,306.465 82.000,306.000 82.000 C 305.560 82.000,305.200 81.749,305.200 81.443 C 305.200 80.831,304.359 80.400,303.167 80.400 C 302.667 80.400,302.400 80.122,302.400 79.600 C 302.400 79.083,302.133 78.800,301.647 78.800 C 301.230 78.800,300.800 78.443,300.684 78.000 C 300.569 77.560,300.188 77.200,299.837 77.200 C 299.487 77.200,299.200 76.930,299.200 76.600 C 299.200 76.270,298.861 76.000,298.447 76.000 C 298.030 76.000,297.600 75.643,297.484 75.200 C 297.324 74.587,296.938 74.400,295.837 74.400 C 294.667 74.400,294.400 74.252,294.400 73.600 C 294.400 73.067,294.133 72.800,293.600 72.800 C 293.067 72.800,292.800 72.533,292.800 72.000 C 292.800 71.467,292.533 71.200,292.000 71.200 C 291.467 71.200,291.200 70.933,291.200 70.400 C 291.200 69.883,290.933 69.600,290.447 69.600 C 290.030 69.600,289.600 69.243,289.484 68.800 C 289.332 68.217,288.938 68.000,288.037 68.000 C 287.067 68.000,286.800 67.828,286.800 67.200 C 286.800 66.667,286.533 66.400,286.000 66.400 C 285.467 66.400,285.200 66.133,285.200 65.600 C 285.200 65.083,284.933 64.800,284.447 64.800 C 284.030 64.800,283.600 64.443,283.484 64.000 C 283.369 63.560,283.007 63.200,282.680 63.200 C 282.353 63.200,281.986 62.940,281.864 62.622 C 281.742 62.304,281.003 61.924,280.221 61.778 C 279.189 61.584,278.800 61.304,278.800 60.755 C 278.800 60.267,278.518 60.000,278.000 60.000 C 277.556 60.000,277.200 59.733,277.200 59.400 C 277.200 59.067,276.844 58.800,276.400 58.800 C 275.867 58.800,275.600 58.533,275.600 58.000 C 275.600 57.467,275.333 57.200,274.800 57.200 C 274.267 57.200,274.000 56.933,274.000 56.400 C 274.000 55.752,273.733 55.600,272.600 55.600 C 271.467 55.600,271.200 55.448,271.200 54.800 C 271.200 54.267,270.933 54.000,270.400 54.000 C 269.867 54.000,269.600 53.733,269.600 53.200 C 269.600 52.667,269.333 52.400,268.800 52.400 C 268.267 52.400,268.000 52.133,268.000 51.600 C 268.000 51.103,267.733 50.800,267.296 50.800 C 266.909 50.800,266.368 50.440,266.093 50.000 C 265.774 49.490,265.160 49.200,264.397 49.200 C 263.467 49.200,263.200 49.022,263.200 48.400 C 263.200 47.867,262.933 47.600,262.400 47.600 C 261.867 47.600,261.600 47.333,261.600 46.800 C 261.600 46.267,261.333 46.000,260.800 46.000 C 260.335 46.000,260.000 45.733,260.000 45.363 C 260.000 45.012,259.640 44.631,259.200 44.516 C 258.760 44.401,258.400 44.078,258.400 43.798 C 258.400 43.518,257.770 43.171,257.000 43.026 C 256.162 42.869,255.600 42.530,255.600 42.182 C 255.600 41.862,255.240 41.600,254.800 41.600 C 254.267 41.600,254.000 41.333,254.000 40.800 C 254.000 40.267,253.733 40.000,253.200 40.000 C 252.667 40.000,252.400 39.733,252.400 39.200 C 252.400 38.683,252.133 38.400,251.647 38.400 C 251.230 38.400,250.800 38.043,250.684 37.600 C 250.524 36.987,250.138 36.800,249.037 36.800 C 247.867 36.800,247.600 36.652,247.600 36.000 C 247.600 35.467,247.333 35.200,246.800 35.200 C 246.267 35.200,246.000 34.933,246.000 34.400 C 246.000 33.867,245.733 33.600,245.200 33.600 C 244.667 33.600,244.400 33.333,244.400 32.800 C 244.400 32.267,244.133 32.000,243.600 32.000 C 243.160 32.000,242.800 31.749,242.800 31.443 C 242.800 30.840,241.962 30.400,240.814 30.400 C 240.418 30.400,239.999 30.040,239.884 29.600 C 239.769 29.160,239.409 28.800,239.084 28.800 C 238.759 28.800,238.399 28.440,238.284 28.000 C 238.169 27.560,237.788 27.200,237.437 27.200 C 237.087 27.200,236.800 26.930,236.800 26.600 C 236.800 26.270,236.461 26.000,236.047 26.000 C 235.630 26.000,235.200 25.643,235.084 25.200 C 234.924 24.587,234.538 24.400,233.437 24.400 C 232.267 24.400,232.000 24.252,232.000 23.600 C 232.000 23.067,231.733 22.800,231.200 22.800 C 230.667 22.800,230.400 22.533,230.400 22.000 C 230.400 21.467,230.133 21.200,229.600 21.200 C 229.067 21.200,228.800 20.933,228.800 20.400 C 228.800 19.883,228.533 19.600,228.047 19.600 C 227.630 19.600,227.200 19.243,227.084 18.800 C 226.934 18.226,226.538 18.000,225.684 18.000 C 224.830 18.000,224.434 17.774,224.284 17.200 C 224.169 16.760,223.809 16.400,223.484 16.400 C 223.159 16.400,222.799 16.040,222.684 15.600 C 222.569 15.160,222.188 14.800,221.837 14.800 C 221.487 14.800,221.200 14.526,221.200 14.190 C 221.200 13.855,220.750 13.409,220.200 13.200 C 219.650 12.991,219.200 12.644,219.200 12.428 C 219.200 12.213,218.587 11.921,217.837 11.781 C 216.968 11.618,216.401 11.248,216.274 10.762 C 216.165 10.343,215.788 10.000,215.437 10.000 C 215.087 10.000,214.800 9.730,214.800 9.400 C 214.800 9.067,214.444 8.800,214.000 8.800 C 213.467 8.800,213.200 8.533,213.200 8.000 C 213.200 7.483,212.933 7.200,212.447 7.200 C 212.030 7.200,211.600 6.843,211.484 6.400 C 211.324 5.787,210.938 5.600,209.837 5.600 C 208.667 5.600,208.400 5.452,208.400 4.800 C 208.400 4.360,208.151 4.000,207.847 4.000 C 207.542 4.000,207.199 3.640,207.084 3.200 C 206.969 2.760,206.609 2.400,206.284 2.400 C 205.959 2.400,205.599 2.040,205.484 1.600 C 205.369 1.160,204.988 0.800,204.637 0.800 C 204.287 0.800,204.000 0.620,204.000 0.400 C 204.000 0.178,202.933 0.000,201.600 0.000 L 199.200 0.000 199.200 37.200 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path1" d="M199.200 37.200 L 199.200 74.400 188.443 74.400 C 179.250 74.400,177.652 74.487,177.455 75.000 C 177.278 75.462,176.507 75.601,174.113 75.604 C 170.054 75.610,168.000 75.962,168.000 76.652 C 168.000 77.065,167.285 77.201,165.100 77.205 C 161.724 77.212,160.400 77.492,160.400 78.202 C 160.400 78.550,159.505 78.760,157.556 78.870 C 155.467 78.988,154.580 79.213,154.212 79.716 C 153.850 80.211,153.132 80.400,151.618 80.400 C 149.862 80.400,149.491 80.529,149.316 81.200 C 149.140 81.872,148.770 82.000,147.000 82.000 C 145.230 82.000,144.860 82.128,144.684 82.800 C 144.519 83.432,144.138 83.600,142.870 83.600 C 140.880 83.600,140.000 83.920,140.000 84.643 C 140.000 85.026,139.501 85.200,138.400 85.200 C 137.067 85.200,136.800 85.333,136.800 86.000 C 136.800 86.667,136.533 86.800,135.200 86.800 C 134.133 86.800,133.333 87.067,132.800 87.600 C 132.345 88.055,131.467 88.400,130.763 88.400 C 129.862 88.400,129.468 88.617,129.316 89.200 C 129.152 89.827,128.770 90.000,127.553 90.000 C 126.267 90.000,126.000 90.137,126.000 90.800 C 126.000 91.449,125.733 91.600,124.587 91.600 C 123.728 91.600,123.088 91.825,122.954 92.176 C 122.833 92.492,122.210 92.866,121.571 93.006 C 120.932 93.147,120.300 93.439,120.166 93.655 C 120.032 93.872,119.490 94.214,118.961 94.415 C 118.433 94.616,118.000 95.055,118.000 95.390 C 118.000 95.823,117.584 96.000,116.563 96.000 C 115.485 96.000,115.075 96.191,114.926 96.762 C 114.799 97.248,114.232 97.618,113.363 97.781 C 112.554 97.932,112.000 98.273,112.000 98.618 C 112.000 98.942,111.629 99.200,111.163 99.200 C 110.662 99.200,110.241 99.521,110.116 100.000 C 109.966 100.574,109.570 100.800,108.716 100.800 C 107.862 100.800,107.466 101.026,107.316 101.600 C 107.200 102.043,106.770 102.400,106.353 102.400 C 105.867 102.400,105.600 102.683,105.600 103.200 C 105.600 103.697,105.333 104.000,104.896 104.000 C 104.509 104.000,103.968 104.360,103.693 104.800 C 103.374 105.310,102.760 105.600,101.997 105.600 C 101.067 105.600,100.800 105.778,100.800 106.400 C 100.800 106.933,100.533 107.200,100.000 107.200 C 99.467 107.200,99.200 107.467,99.200 108.000 C 99.200 108.533,98.933 108.800,98.400 108.800 C 97.960 108.800,97.600 109.050,97.600 109.355 C 97.600 109.674,97.002 110.023,96.200 110.174 C 95.428 110.318,94.800 110.676,94.800 110.971 C 94.800 111.266,94.440 111.601,94.000 111.716 C 93.560 111.831,93.200 112.212,93.200 112.563 C 93.200 112.933,92.865 113.200,92.400 113.200 C 91.867 113.200,91.600 113.467,91.600 114.000 C 91.600 114.533,91.333 114.800,90.800 114.800 C 90.267 114.800,90.000 115.067,90.000 115.600 C 90.000 116.133,89.733 116.400,89.200 116.400 C 88.667 116.400,88.400 116.667,88.400 117.200 C 88.400 117.733,88.133 118.000,87.600 118.000 C 87.067 118.000,86.800 118.267,86.800 118.800 C 86.800 119.333,86.533 119.600,86.000 119.600 C 85.467 119.600,85.200 119.867,85.200 120.400 C 85.200 120.933,84.933 121.200,84.400 121.200 C 83.867 121.200,83.600 121.467,83.600 122.000 C 83.600 122.533,83.333 122.800,82.800 122.800 C 82.267 122.800,82.000 123.067,82.000 123.600 C 82.000 124.133,81.733 124.400,81.200 124.400 C 80.760 124.400,80.400 124.658,80.400 124.973 C 80.400 125.288,80.040 125.660,79.600 125.800 C 79.160 125.940,78.800 126.291,78.800 126.580 C 78.800 126.870,78.440 127.201,78.000 127.316 C 77.560 127.431,77.200 127.812,77.200 128.163 C 77.200 128.513,76.930 128.800,76.600 128.800 C 76.267 128.800,76.000 129.156,76.000 129.600 C 76.000 130.133,75.733 130.400,75.200 130.400 C 74.683 130.400,74.400 130.667,74.400 131.153 C 74.400 131.570,74.043 132.000,73.600 132.116 C 73.060 132.257,72.800 132.662,72.800 133.359 C 72.800 133.960,72.465 134.603,72.000 134.893 C 71.560 135.168,71.200 135.709,71.200 136.096 C 71.200 136.533,70.897 136.800,70.400 136.800 C 69.867 136.800,69.600 137.067,69.600 137.600 C 69.600 138.133,69.333 138.400,68.800 138.400 C 68.263 138.400,68.000 138.667,68.000 139.213 C 68.000 139.659,67.741 140.124,67.424 140.246 C 67.108 140.367,66.735 140.984,66.597 141.615 C 66.457 142.249,65.998 142.874,65.572 143.009 C 65.147 143.144,64.800 143.602,64.800 144.027 C 64.800 144.452,64.549 144.800,64.243 144.800 C 63.631 144.800,63.200 145.641,63.200 146.833 C 63.200 147.255,62.926 147.600,62.590 147.600 C 62.255 147.600,61.809 148.050,61.600 148.600 C 61.391 149.150,61.044 149.600,60.828 149.600 C 60.613 149.600,60.318 150.230,60.174 151.000 C 60.023 151.802,59.674 152.400,59.355 152.400 C 59.035 152.400,58.800 152.809,58.800 153.367 C 58.800 154.748,58.402 155.600,57.757 155.600 C 57.451 155.600,57.200 155.917,57.200 156.304 C 57.200 156.691,56.840 157.232,56.400 157.507 C 55.901 157.819,55.600 158.440,55.600 159.157 C 55.600 159.970,55.366 160.368,54.800 160.516 C 54.222 160.667,54.000 161.062,54.000 161.936 C 54.000 162.795,53.768 163.220,53.200 163.400 C 52.620 163.584,52.400 164.005,52.400 164.931 C 52.400 165.774,52.129 166.377,51.600 166.707 C 51.018 167.071,50.800 167.640,50.800 168.800 C 50.800 169.960,50.582 170.529,50.000 170.893 C 49.430 171.249,49.200 171.826,49.200 172.896 C 49.200 174.133,49.058 174.400,48.400 174.400 C 47.733 174.400,47.600 174.667,47.600 176.000 C 47.600 177.096,47.426 177.600,47.047 177.600 C 46.416 177.600,46.013 178.800,46.005 180.700 C 46.002 181.542,45.804 182.000,45.443 182.000 C 44.704 182.000,44.400 182.886,44.400 185.033 C 44.400 186.266,44.234 186.800,43.850 186.800 C 43.283 186.800,42.800 188.460,42.800 190.407 C 42.800 191.022,42.533 191.617,42.200 191.745 C 41.747 191.919,41.600 192.651,41.600 194.741 C 41.600 197.170,41.503 197.532,40.800 197.716 C 40.078 197.905,40.000 198.262,40.000 201.359 C 40.000 204.360,39.899 204.856,39.200 205.293 C 38.478 205.744,38.400 206.226,38.400 210.250 C 38.400 214.370,38.340 214.722,37.600 214.916 C 36.342 215.245,36.342 259.521,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.529 277.200,41.600 277.467,41.600 280.213 C 41.600 282.521,41.740 283.279,42.200 283.455 C 42.607 283.612,42.800 284.250,42.800 285.443 C 42.800 286.667,43.043 287.443,43.600 288.000 C 44.168 288.568,44.400 289.333,44.400 290.637 C 44.400 292.138,44.546 292.513,45.200 292.684 C 45.844 292.852,46.000 293.230,46.000 294.614 C 46.000 296.716,46.309 297.600,47.043 297.600 C 47.426 297.600,47.600 298.099,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.035 300.800,49.201 301.068,49.205 302.100 C 49.213 304.000,49.616 305.200,50.247 305.200 C 50.615 305.200,50.800 305.680,50.800 306.637 C 50.800 307.738,50.987 308.124,51.600 308.284 C 52.227 308.448,52.400 308.830,52.400 310.047 C 52.400 311.333,52.537 311.600,53.200 311.600 C 53.852 311.600,54.000 311.867,54.000 313.037 C 54.000 314.138,54.187 314.524,54.800 314.684 C 55.397 314.840,55.600 315.230,55.600 316.220 C 55.600 317.195,55.812 317.613,56.400 317.800 C 56.840 317.940,57.200 318.402,57.200 318.827 C 57.200 319.252,57.451 319.600,57.757 319.600 C 58.371 319.600,58.800 320.441,58.800 321.645 C 58.800 322.074,59.065 322.527,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 63.052 327.200,63.200 327.467,63.200 328.637 C 63.200 329.738,63.387 330.124,64.000 330.284 C 64.443 330.400,64.800 330.830,64.800 331.247 C 64.800 331.733,65.083 332.000,65.600 332.000 C 66.224 332.000,66.400 332.267,66.400 333.213 C 66.400 333.948,66.648 334.520,67.031 334.667 C 67.377 334.800,67.823 335.335,68.021 335.855 C 68.218 336.375,68.655 336.800,68.990 336.800 C 69.333 336.800,69.600 337.150,69.600 337.600 C 69.600 338.133,69.867 338.400,70.400 338.400 C 70.933 338.400,71.200 338.667,71.200 339.200 C 71.200 339.640,71.560 340.360,72.000 340.800 C 72.440 341.240,72.800 341.870,72.800 342.200 C 72.800 342.533,73.156 342.800,73.600 342.800 C 74.133 342.800,74.400 343.067,74.400 343.600 C 74.400 344.040,74.658 344.400,74.973 344.400 C 75.288 344.400,75.660 344.760,75.800 345.200 C 75.940 345.640,76.312 346.000,76.627 346.000 C 76.942 346.000,77.200 346.360,77.200 346.800 C 77.200 347.333,77.467 347.600,78.000 347.600 C 78.533 347.600,78.800 347.867,78.800 348.400 C 78.800 348.933,79.067 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.317 360.000,91.600 360.267,91.600 360.753 C 91.600 361.170,91.957 361.600,92.400 361.716 C 92.840 361.831,93.200 362.212,93.200 362.563 C 93.200 362.913,93.458 363.200,93.773 363.200 C 94.088 363.200,94.460 363.560,94.600 364.000 C 94.740 364.440,95.202 364.800,95.627 364.800 C 96.052 364.800,96.400 365.062,96.400 365.382 C 96.400 365.730,96.962 366.069,97.800 366.226 C 98.813 366.416,99.200 366.698,99.200 367.245 C 99.200 367.733,99.482 368.000,100.000 368.000 C 100.533 368.000,100.800 368.267,100.800 368.800 C 100.800 369.318,101.067 369.600,101.557 369.600 C 101.974 369.600,102.414 369.860,102.536 370.178 C 102.658 370.496,103.397 370.876,104.179 371.022 C 105.211 371.216,105.600 371.496,105.600 372.045 C 105.600 372.533,105.882 372.800,106.400 372.800 C 106.840 372.800,107.200 373.050,107.200 373.355 C 107.200 373.674,107.798 374.023,108.600 374.174 C 109.438 374.331,110.000 374.670,110.000 375.018 C 110.000 375.338,110.348 375.600,110.773 375.600 C 111.198 375.600,111.660 375.960,111.800 376.400 C 111.989 376.995,112.405 377.200,113.427 377.200 C 114.533 377.200,114.800 377.355,114.800 378.000 C 114.800 378.622,115.067 378.800,115.997 378.800 C 116.760 378.800,117.374 379.090,117.693 379.600 C 117.968 380.040,118.488 380.400,118.850 380.400 C 119.211 380.400,119.601 380.760,119.716 381.200 C 119.876 381.813,120.262 382.000,121.363 382.000 C 122.533 382.000,122.800 382.148,122.800 382.800 C 122.800 383.467,123.067 383.600,124.400 383.600 C 125.733 383.600,126.000 383.733,126.000 384.400 C 126.000 385.045,126.267 385.200,127.373 385.200 C 128.395 385.200,128.811 385.405,129.000 386.000 C 129.187 386.589,129.605 386.800,130.584 386.800 C 131.375 386.800,132.004 387.034,132.136 387.378 C 132.258 387.696,133.042 388.082,133.879 388.236 C 134.716 388.390,135.829 388.850,136.354 389.258 C 136.879 389.666,137.914 390.000,138.654 390.000 C 139.528 390.000,140.000 390.192,140.000 390.549 C 140.000 390.918,140.675 391.163,142.054 391.296 C 143.383 391.423,144.238 391.724,144.474 392.146 C 144.743 392.627,145.419 392.800,147.020 392.800 C 148.933 392.800,149.200 392.898,149.200 393.600 C 149.200 394.311,149.467 394.400,151.600 394.400 C 153.733 394.400,154.000 394.489,154.000 395.200 C 154.000 395.928,154.267 396.000,156.973 396.000 C 159.595 396.000,159.976 396.095,160.200 396.800 C 160.423 397.504,160.805 397.600,163.380 397.600 C 165.970 397.600,166.331 397.692,166.516 398.400 C 166.710 399.142,167.062 399.200,171.363 399.200 C 174.188 399.200,176.000 399.356,176.000 399.600 C 176.000 399.862,184.267 400.000,200.000 400.000 C 215.733 400.000,224.000 399.862,224.000 399.600 C 224.000 399.356,225.812 399.200,228.637 399.200 C 232.938 399.200,233.290 399.142,233.484 398.400 C 233.671 397.685,234.030 397.600,236.843 397.600 C 239.560 397.600,240.062 397.490,240.493 396.800 C 240.906 396.138,241.426 396.000,243.496 396.000 C 245.733 396.000,246.000 395.915,246.000 395.200 C 246.000 394.489,246.267 394.400,248.400 394.400 C 250.267 394.400,250.978 394.222,251.600 393.600 C 252.107 393.093,252.933 392.800,253.856 392.800 C 254.729 392.800,255.499 392.544,255.780 392.159 C 256.043 391.800,257.073 391.426,258.124 391.307 C 259.239 391.182,260.000 390.894,260.000 390.599 C 260.000 390.293,260.790 390.026,262.054 389.904 C 263.383 389.777,264.238 389.476,264.474 389.054 C 264.675 388.694,265.266 388.400,265.787 388.400 C 267.149 388.400,268.000 387.999,268.000 387.357 C 268.000 386.984,268.475 386.800,269.437 386.800 C 270.538 386.800,270.924 386.613,271.084 386.000 C 271.241 385.399,271.630 385.200,272.647 385.200 C 273.733 385.200,274.000 385.042,274.000 384.400 C 274.000 383.733,274.267 383.600,275.600 383.600 C 276.933 383.600,277.200 383.467,277.200 382.800 C 277.200 382.133,277.467 382.000,278.800 382.000 C 280.133 382.000,280.400 381.867,280.400 381.200 C 280.400 380.578,280.667 380.400,281.597 380.400 C 282.360 380.400,282.974 380.110,283.293 379.600 C 283.568 379.160,284.109 378.800,284.496 378.800 C 284.933 378.800,285.200 378.497,285.200 378.000 C 285.200 377.348,285.467 377.200,286.637 377.200 C 287.738 377.200,288.124 377.013,288.284 376.400 C 288.400 375.955,288.830 375.600,289.251 375.600 C 289.667 375.600,290.316 375.240,290.693 374.800 C 291.070 374.360,291.698 374.000,292.089 374.000 C 292.480 374.000,292.800 373.730,292.800 373.400 C 292.800 373.067,293.156 372.800,293.600 372.800 C 294.133 372.800,294.400 372.533,294.400 372.000 C 294.400 371.421,294.667 371.200,295.367 371.200 C 296.748 371.200,297.600 370.802,297.600 370.157 C 297.600 369.851,297.960 369.600,298.400 369.600 C 298.933 369.600,299.200 369.333,299.200 368.800 C 299.200 368.267,299.467 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.576,301.067 366.400,302.013 366.400 C 302.748 366.400,303.320 366.152,303.467 365.769 C 303.600 365.423,304.135 364.977,304.655 364.779 C 305.175 364.582,305.600 364.166,305.600 363.857 C 305.600 363.547,305.960 363.199,306.400 363.084 C 306.840 362.969,307.200 362.588,307.200 362.237 C 307.200 361.887,307.470 361.600,307.800 361.600 C 308.133 361.600,308.400 361.244,308.400 360.800 C 308.400 360.267,308.667 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.232,311.600 358.027 C 311.600 357.822,311.916 357.554,312.302 357.431 C 313.725 356.979,321.200 349.174,321.200 348.139 C 321.200 347.843,321.560 347.600,322.000 347.600 C 322.533 347.600,322.800 347.333,322.800 346.800 C 322.800 346.360,323.058 346.000,323.373 346.000 C 323.688 346.000,324.060 345.640,324.200 345.200 C 324.340 344.760,324.712 344.400,325.027 344.400 C 325.342 344.400,325.600 344.040,325.600 343.600 C 325.600 343.067,325.867 342.800,326.400 342.800 C 326.933 342.800,327.200 342.533,327.200 342.000 C 327.200 341.467,327.467 341.200,328.000 341.200 C 328.648 341.200,328.800 340.933,328.800 339.800 C 328.800 338.667,328.952 338.400,329.600 338.400 C 330.133 338.400,330.400 338.133,330.400 337.600 C 330.400 337.067,330.667 336.800,331.200 336.800 C 331.717 336.800,332.000 336.533,332.000 336.047 C 332.000 335.630,332.357 335.200,332.800 335.084 C 333.413 334.924,333.600 334.538,333.600 333.437 C 333.600 332.267,333.748 332.000,334.400 332.000 C 334.917 332.000,335.200 331.733,335.200 331.247 C 335.200 330.830,335.557 330.400,336.000 330.284 C 336.540 330.143,336.800 329.738,336.800 329.041 C 336.800 328.440,337.135 327.797,337.600 327.507 C 338.040 327.232,338.400 326.691,338.400 326.304 C 338.400 325.917,338.662 325.600,338.982 325.600 C 339.330 325.600,339.669 325.038,339.826 324.200 C 339.977 323.398,340.326 322.800,340.645 322.800 C 340.950 322.800,341.200 322.446,341.200 322.014 C 341.200 321.582,341.560 321.035,342.000 320.800 C 342.513 320.526,342.800 319.962,342.800 319.233 C 342.800 318.430,343.036 318.032,343.600 317.884 C 344.213 317.724,344.400 317.338,344.400 316.237 C 344.400 315.067,344.548 314.800,345.200 314.800 C 345.867 314.800,346.000 314.533,346.000 313.200 C 346.000 311.867,346.133 311.600,346.800 311.600 C 347.467 311.600,347.600 311.333,347.600 310.000 C 347.600 308.667,347.733 308.400,348.400 308.400 C 349.052 308.400,349.200 308.133,349.200 306.963 C 349.200 305.862,349.387 305.476,350.000 305.316 C 350.601 305.159,350.800 304.770,350.800 303.753 C 350.800 302.933,351.115 302.085,351.600 301.600 C 352.125 301.075,352.400 300.267,352.400 299.247 C 352.400 298.030,352.573 297.648,353.200 297.484 C 353.853 297.313,354.000 296.938,354.000 295.441 C 354.000 294.040,354.189 293.489,354.800 293.107 C 355.409 292.727,355.600 292.174,355.600 290.793 C 355.600 289.473,355.818 288.791,356.400 288.293 C 357.002 287.777,357.200 287.113,357.200 285.604 C 357.200 284.089,357.347 283.600,357.800 283.600 C 358.267 283.600,358.400 283.067,358.400 281.200 C 358.400 279.333,358.578 278.622,359.200 278.000 C 359.856 277.344,360.000 276.667,360.000 274.247 C 360.000 271.630,360.091 271.269,360.800 271.084 C 361.542 270.890,361.600 270.538,361.600 266.237 C 361.600 261.867,361.646 261.600,362.400 261.600 C 363.175 261.600,363.200 261.333,363.200 253.020 C 363.200 245.264,363.267 244.402,363.900 244.048 C 364.462 243.733,364.628 242.982,364.741 240.228 L 364.882 236.800 338.241 236.800 L 311.600 236.800 311.600 239.469 C 311.600 241.449,311.419 242.336,310.900 242.910 C 310.316 243.554,310.177 244.652,310.061 249.526 C 309.962 253.669,309.771 255.490,309.406 255.785 C 309.096 256.035,308.807 257.537,308.679 259.565 C 308.522 262.060,308.303 263.023,307.833 263.285 C 307.344 263.559,307.200 264.317,307.200 266.620 C 307.200 269.333,307.128 269.600,306.400 269.600 C 305.689 269.600,305.600 269.867,305.600 272.000 C 305.600 274.133,305.511 274.400,304.800 274.400 C 304.137 274.400,304.000 274.667,304.000 275.953 C 304.000 277.170,303.827 277.552,303.200 277.716 C 302.532 277.891,302.400 278.262,302.400 279.963 C 302.400 281.733,302.295 282.000,301.600 282.000 C 300.933 282.000,300.800 282.267,300.800 283.600 C 300.800 284.933,300.667 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.733 288.400,297.600 288.667,297.600 290.000 C 297.600 291.333,297.467 291.600,296.800 291.600 C 296.282 291.600,296.000 291.867,296.000 292.357 C 296.000 292.774,295.747 293.212,295.438 293.330 C 295.128 293.449,294.754 294.098,294.606 294.773 C 294.458 295.448,294.097 296.000,293.803 296.000 C 293.493 296.000,293.157 296.669,293.000 297.600 C 292.834 298.584,292.512 299.200,292.165 299.200 C 291.854 299.200,291.600 299.560,291.600 300.000 C 291.600 300.533,291.333 300.800,290.800 300.800 C 290.271 300.800,290.000 301.067,290.000 301.586 C 290.000 302.018,289.640 302.565,289.200 302.800 C 288.676 303.080,288.400 303.638,288.400 304.414 C 288.400 305.333,288.220 305.600,287.600 305.600 C 287.067 305.600,286.800 305.867,286.800 306.400 C 286.800 306.933,286.533 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.867 308.800,283.600 309.067,283.600 309.600 C 283.600 310.052,283.333 310.400,282.987 310.400 C 282.651 310.400,282.263 310.692,282.126 311.050 C 281.989 311.407,281.186 312.442,280.343 313.350 C 279.500 314.257,278.808 315.315,278.805 315.700 C 278.802 316.132,278.493 316.400,278.000 316.400 C 277.544 316.400,277.200 316.667,277.200 317.021 C 277.200 317.362,276.660 317.830,276.000 318.060 C 275.340 318.290,274.800 318.645,274.800 318.849 C 274.800 319.053,274.350 319.391,273.800 319.600 C 273.250 319.809,272.800 320.255,272.800 320.590 C 272.800 320.933,272.450 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.133,269.333 324.400,268.800 324.400 C 268.360 324.400,268.000 324.656,268.000 324.968 C 268.000 325.281,267.448 325.658,266.773 325.806 C 266.098 325.954,265.455 326.312,265.344 326.602 C 265.233 326.891,264.705 327.237,264.171 327.372 C 263.637 327.506,263.200 327.861,263.200 328.161 C 263.200 328.461,262.840 328.801,262.400 328.916 C 261.960 329.031,261.600 329.412,261.600 329.763 C 261.600 330.224,261.214 330.400,260.200 330.400 C 259.094 330.400,258.800 330.559,258.800 331.155 C 258.800 331.704,258.411 331.984,257.379 332.178 C 256.597 332.324,255.858 332.704,255.736 333.022 C 255.614 333.340,255.174 333.600,254.757 333.600 C 254.267 333.600,254.000 333.882,254.000 334.400 C 254.000 335.067,253.733 335.200,252.400 335.200 C 251.067 335.200,250.800 335.333,250.800 336.000 C 250.800 336.667,250.533 336.800,249.200 336.800 C 247.867 336.800,247.600 336.933,247.600 337.600 C 247.600 338.252,247.333 338.400,246.163 338.400 C 245.062 338.400,244.676 338.587,244.516 339.200 C 244.342 339.865,243.970 340.000,242.316 340.000 C 240.662 340.000,240.290 340.135,240.116 340.800 C 239.952 341.427,239.570 341.600,238.353 341.600 C 237.239 341.600,236.800 341.770,236.800 342.200 C 236.800 342.643,236.337 342.800,235.033 342.800 C 232.886 342.800,232.000 343.104,232.000 343.843 C 232.000 344.256,231.389 344.400,229.633 344.400 C 226.940 344.400,226.000 344.659,226.000 345.403 C 226.000 345.778,225.000 345.959,222.368 346.060 C 219.478 346.171,218.630 346.343,218.223 346.900 C 217.776 347.512,216.970 347.600,211.818 347.600 C 206.262 347.600,205.913 347.646,205.716 348.400 C 205.519 349.151,205.170 349.200,200.000 349.200 C 194.830 349.200,194.481 349.151,194.284 348.400 C 194.087 347.646,193.738 347.600,188.237 347.600 C 182.933 347.600,182.327 347.527,181.600 346.800 C 180.925 346.125,180.267 346.000,177.400 346.000 C 174.761 346.000,174.000 345.875,174.000 345.443 C 174.000 344.679,173.105 344.400,170.656 344.400 C 169.073 344.400,168.415 344.209,167.893 343.600 C 167.423 343.051,166.713 342.800,165.632 342.800 C 164.766 342.800,163.787 342.530,163.457 342.200 C 163.127 341.870,162.214 341.600,161.429 341.600 C 160.267 341.600,160.000 341.451,160.000 340.800 C 160.000 340.119,159.733 340.000,158.203 340.000 C 156.840 340.000,156.286 339.807,155.907 339.200 C 155.551 338.630,154.974 338.400,153.904 338.400 C 152.667 338.400,152.400 338.258,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.333,148.933 335.200,147.600 335.200 C 146.267 335.200,146.000 335.067,146.000 334.400 C 146.000 333.867,145.733 333.600,145.200 333.600 C 144.760 333.600,144.400 333.349,144.400 333.043 C 144.400 332.398,143.548 332.000,142.167 332.000 C 141.467 332.000,141.200 331.779,141.200 331.200 C 141.200 330.667,140.933 330.400,140.400 330.400 C 139.960 330.400,139.240 330.040,138.800 329.600 C 138.360 329.160,137.730 328.800,137.400 328.800 C 137.070 328.800,136.800 328.526,136.800 328.190 C 136.800 327.855,136.350 327.409,135.800 327.200 C 135.250 326.991,134.800 326.655,134.800 326.454 C 134.800 326.253,134.170 325.971,133.400 325.826 C 132.562 325.669,132.000 325.330,132.000 324.982 C 132.000 324.662,131.640 324.400,131.200 324.400 C 130.667 324.400,130.400 324.133,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.935 319.600,125.600 319.333,125.600 318.963 C 125.600 318.612,125.240 318.231,124.800 318.116 C 124.360 318.001,124.000 317.658,124.000 317.353 C 124.000 317.049,123.852 316.800,123.672 316.800 C 123.141 316.800,120.800 314.570,120.800 314.064 C 120.800 313.809,120.542 313.600,120.227 313.600 C 119.912 313.600,119.540 313.240,119.400 312.800 C 119.260 312.360,118.888 312.000,118.573 312.000 C 118.258 312.000,118.000 311.661,118.000 311.247 C 118.000 310.830,117.643 310.400,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.467 307.200,113.200 306.933,113.200 306.400 C 113.200 305.867,112.933 305.600,112.400 305.600 C 111.748 305.600,111.600 305.333,111.600 304.163 C 111.600 303.062,111.413 302.676,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.576 300.800,108.400 300.533,108.400 299.587 C 108.400 298.913,108.150 298.279,107.836 298.159 C 107.526 298.039,107.163 297.505,107.028 296.971 C 106.894 296.437,106.538 296.000,106.237 296.000 C 105.927 296.000,105.575 295.391,105.426 294.600 C 105.269 293.762,104.930 293.200,104.582 293.200 C 104.262 293.200,104.000 292.874,104.000 292.475 C 104.000 292.077,103.640 291.364,103.200 290.892 C 102.760 290.420,102.400 289.666,102.400 289.217 C 102.400 288.667,102.139 288.400,101.600 288.400 C 100.933 288.400,100.800 288.133,100.800 286.800 C 100.800 285.467,100.667 285.200,100.000 285.200 C 99.333 285.200,99.200 284.933,99.200 283.600 C 99.200 282.533,98.933 281.733,98.400 281.200 C 97.911 280.711,97.600 279.867,97.600 279.027 C 97.600 278.005,97.395 277.589,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.523 272.739,94.400 272.370,94.400 270.516 C 94.400 268.662,94.277 268.293,93.600 268.116 C 92.916 267.937,92.800 267.570,92.800 265.582 C 92.800 263.998,92.599 263.056,92.169 262.626 C 91.756 262.213,91.457 260.928,91.304 258.904 C 91.172 257.152,90.839 255.581,90.535 255.278 C 89.583 254.326,89.645 221.098,90.600 220.143 C 90.865 219.878,91.181 218.212,91.302 216.441 C 91.452 214.262,91.730 213.013,92.161 212.581 C 92.614 212.129,92.800 211.193,92.800 209.371 C 92.800 207.067,92.883 206.800,93.600 206.800 C 94.302 206.800,94.400 206.533,94.400 204.627 C 94.400 202.805,94.529 202.413,95.200 202.200 C 95.871 201.987,96.000 201.595,96.000 199.773 C 96.000 197.867,96.098 197.600,96.800 197.600 C 97.463 197.600,97.600 197.333,97.600 196.047 C 97.600 194.830,97.773 194.448,98.400 194.284 C 99.052 194.113,99.200 193.738,99.200 192.252 C 99.200 190.838,99.380 190.332,100.000 190.000 C 100.440 189.765,100.800 189.246,100.800 188.848 C 100.800 188.450,101.160 187.798,101.600 187.400 C 102.040 187.002,102.400 186.254,102.400 185.738 C 102.400 185.184,102.638 184.800,102.982 184.800 C 103.330 184.800,103.669 184.238,103.826 183.400 C 103.971 182.630,104.320 182.000,104.602 182.000 C 105.199 182.000,105.600 181.121,105.600 179.814 C 105.600 179.230,105.892 178.817,106.400 178.684 C 106.840 178.569,107.200 178.188,107.200 177.837 C 107.200 177.487,107.470 177.200,107.800 177.200 C 108.217 177.200,108.400 176.781,108.400 175.827 C 108.400 174.805,108.605 174.389,109.200 174.200 C 109.640 174.060,110.000 173.700,110.000 173.400 C 110.000 173.100,110.360 172.740,110.800 172.600 C 111.240 172.460,111.600 172.088,111.600 171.773 C 111.600 171.458,111.960 170.840,112.400 170.400 C 112.840 169.960,113.200 169.240,113.200 168.800 C 113.200 168.267,113.467 168.000,114.000 168.000 C 114.533 168.000,114.800 167.733,114.800 167.200 C 114.800 166.667,115.067 166.400,115.600 166.400 C 116.133 166.400,116.400 166.133,116.400 165.600 C 116.400 165.067,116.667 164.800,117.200 164.800 C 117.717 164.800,118.000 164.533,118.000 164.047 C 118.000 163.630,118.357 163.200,118.800 163.084 C 119.240 162.969,119.600 162.588,119.600 162.237 C 119.600 161.887,119.858 161.600,120.173 161.600 C 120.488 161.600,120.860 161.240,121.000 160.800 C 121.140 160.360,121.512 160.000,121.827 160.000 C 122.142 160.000,122.400 159.640,122.400 159.200 C 122.400 158.667,122.667 158.400,123.200 158.400 C 123.665 158.400,124.000 158.133,124.000 157.763 C 124.000 157.412,124.360 157.031,124.800 156.916 C 125.240 156.801,125.600 156.479,125.600 156.200 C 125.600 155.921,125.960 155.599,126.400 155.484 C 126.840 155.369,127.200 154.988,127.200 154.637 C 127.200 154.267,127.535 154.000,128.000 154.000 C 128.533 154.000,128.800 153.733,128.800 153.200 C 128.800 152.667,129.067 152.400,129.600 152.400 C 130.133 152.400,130.400 152.133,130.400 151.600 C 130.400 151.067,130.667 150.800,131.200 150.800 C 131.640 150.800,132.360 150.440,132.800 150.000 C 133.240 149.560,133.887 149.200,134.237 149.200 C 134.588 149.200,134.969 148.840,135.084 148.400 C 135.200 147.957,135.630 147.600,136.047 147.600 C 136.533 147.600,136.800 147.317,136.800 146.800 C 136.800 146.172,137.067 146.000,138.037 146.000 C 138.938 146.000,139.332 145.783,139.484 145.200 C 139.600 144.757,140.030 144.400,140.447 144.400 C 140.933 144.400,141.200 144.117,141.200 143.600 C 141.200 142.933,141.467 142.800,142.800 142.800 C 144.133 142.800,144.400 142.667,144.400 142.000 C 144.400 141.352,144.667 141.200,145.800 141.200 C 146.570 141.200,147.200 141.022,147.200 140.805 C 147.200 140.588,147.808 140.157,148.551 139.846 C 149.294 139.536,150.025 139.083,150.175 138.841 C 150.325 138.598,150.790 138.400,151.210 138.400 C 151.629 138.400,152.165 138.040,152.400 137.600 C 152.699 137.042,153.238 136.800,154.181 136.800 C 155.930 136.800,156.800 136.454,156.800 135.757 C 156.800 135.374,157.299 135.200,158.400 135.200 C 159.733 135.200,160.000 135.067,160.000 134.400 C 160.000 133.695,160.267 133.600,162.237 133.600 C 164.138 133.600,164.506 133.480,164.684 132.800 C 164.860 132.127,165.230 132.000,167.020 132.000 C 168.795 132.000,169.188 131.868,169.400 131.200 C 169.619 130.509,170.005 130.400,172.224 130.400 C 174.360 130.400,174.877 130.265,175.293 129.600 C 175.723 128.912,176.226 128.800,178.896 128.800 C 181.467 128.800,182.137 128.663,182.800 128.000 C 183.545 127.255,184.133 127.200,191.400 127.200 L 199.200 127.200 199.200 164.000 L 199.200 200.800 201.373 200.800 C 203.153 200.800,203.589 200.663,203.786 200.043 C 203.918 199.627,204.381 199.194,204.813 199.081 C 205.246 198.967,205.600 198.609,205.600 198.284 C 205.600 197.959,205.960 197.599,206.400 197.484 C 206.840 197.369,207.200 196.988,207.200 196.637 C 207.200 196.287,207.430 196.000,207.712 196.000 C 207.993 196.000,208.483 195.640,208.800 195.200 C 209.139 194.730,209.835 194.400,210.488 194.400 C 211.333 194.400,211.600 194.208,211.600 193.600 C 211.600 193.067,211.867 192.800,212.400 192.800 C 212.933 192.800,213.200 192.533,213.200 192.000 C 213.200 191.467,213.467 191.200,214.000 191.200 C 214.444 191.200,214.800 190.933,214.800 190.600 C 214.800 190.270,215.064 190.000,215.386 190.000 C 215.708 190.000,216.165 189.640,216.400 189.200 C 216.635 188.760,217.182 188.400,217.614 188.400 C 218.046 188.400,218.729 188.071,219.131 187.669 C 219.532 187.268,220.162 186.823,220.531 186.682 C 220.899 186.541,221.200 186.170,221.200 185.859 C 221.200 185.548,221.560 185.199,222.000 185.084 C 222.440 184.969,222.800 184.588,222.800 184.237 C 222.800 183.887,223.064 183.600,223.386 183.600 C 223.708 183.600,224.165 183.240,224.400 182.800 C 224.680 182.276,225.238 182.000,226.014 182.000 C 226.933 182.000,227.200 181.820,227.200 181.200 C 227.200 180.667,227.467 180.400,228.000 180.400 C 228.533 180.400,228.800 180.133,228.800 179.600 C 228.800 179.067,229.067 178.800,229.600 178.800 C 230.133 178.800,230.400 178.533,230.400 178.000 C 230.400 177.467,230.667 177.200,231.200 177.200 C 231.640 177.200,232.360 176.840,232.800 176.400 C 233.240 175.960,233.887 175.600,234.237 175.600 C 234.588 175.600,234.969 175.240,235.084 174.800 C 235.200 174.357,235.630 174.000,236.047 174.000 C 236.461 174.000,236.800 173.751,236.800 173.447 C 236.800 173.142,237.160 172.799,237.600 172.684 C 238.040 172.569,238.400 172.188,238.400 171.837 C 238.400 171.487,238.636 171.200,238.925 171.200 C 239.213 171.200,239.836 170.840,240.308 170.400 C 240.780 169.960,241.461 169.600,241.821 169.600 C 242.181 169.600,242.569 169.240,242.684 168.800 C 242.800 168.357,243.230 168.000,243.647 168.000 C 244.133 168.000,244.400 167.717,244.400 167.200 C 244.400 166.667,244.667 166.400,245.200 166.400 C 245.733 166.400,246.000 166.133,246.000 165.600 C 246.000 165.067,246.267 164.800,246.800 164.800 C 247.240 164.800,247.960 164.440,248.400 164.000 C 248.840 163.560,249.487 163.200,249.837 163.200 C 250.188 163.200,250.569 162.840,250.684 162.400 C 250.800 161.957,251.230 161.600,251.647 161.600 C 252.133 161.600,252.400 161.317,252.400 160.800 C 252.400 160.267,252.667 160.000,253.200 160.000 C 253.733 160.000,254.000 159.733,254.000 159.200 C 254.000 158.665,254.267 158.400,254.804 158.400 C 255.246 158.400,255.916 158.040,256.293 157.600 C 256.670 157.160,257.298 156.800,257.689 156.800 C 258.080 156.800,258.400 156.551,258.400 156.247 C 258.400 155.942,258.760 155.599,259.200 155.484 C 259.640 155.369,260.000 154.988,260.000 154.637 C 260.000 154.267,260.335 154.000,260.800 154.000 C 261.333 154.000,261.600 153.733,261.600 153.200 C 261.600 152.703,261.867 152.400,262.304 152.400 C 262.691 152.400,263.232 152.040,263.507 151.600 C 263.797 151.135,264.440 150.800,265.041 150.800 C 265.738 150.800,266.143 150.540,266.284 150.000 C 266.400 149.557,266.830 149.200,267.247 149.200 C 267.733 149.200,268.000 148.917,268.000 148.400 C 268.000 147.867,268.267 147.600,268.800 147.600 C 269.333 147.600,269.600 147.333,269.600 146.800 C 269.600 146.303,269.867 146.000,270.304 146.000 C 270.691 146.000,271.232 145.640,271.507 145.200 C 271.790 144.748,272.440 144.400,273.003 144.400 C 273.733 144.400,274.000 144.186,274.000 143.600 C 274.000 143.067,274.267 142.800,274.800 142.800 C 275.333 142.800,275.600 142.533,275.600 142.000 C 275.600 141.467,275.867 141.200,276.400 141.200 C 276.844 141.200,277.200 140.933,277.200 140.600 C 277.200 140.270,277.517 140.000,277.904 140.000 C 278.291 140.000,278.822 139.656,279.085 139.236 C 279.347 138.816,280.110 138.351,280.781 138.204 C 281.451 138.057,282.000 137.681,282.000 137.368 C 282.000 137.056,282.287 136.800,282.637 136.800 C 282.988 136.800,283.369 136.440,283.484 136.000 C 283.600 135.557,284.030 135.200,284.447 135.200 C 284.933 135.200,285.200 134.917,285.200 134.400 C 285.200 133.903,285.467 133.600,285.904 133.600 C 286.291 133.600,286.832 133.240,287.107 132.800 C 287.390 132.348,288.040 132.000,288.603 132.000 C 289.333 132.000,289.600 131.786,289.600 131.200 C 289.600 130.667,289.867 130.400,290.400 130.400 C 290.933 130.400,291.200 130.133,291.200 129.600 C 291.200 129.067,291.467 128.800,292.000 128.800 C 292.533 128.800,292.800 128.533,292.800 128.000 C 292.800 127.500,293.067 127.200,293.512 127.200 C 293.903 127.200,294.483 126.840,294.800 126.400 C 295.139 125.930,295.835 125.600,296.488 125.600 C 297.333 125.600,297.600 125.408,297.600 124.800 C 297.600 124.267,297.867 124.000,298.400 124.000 C 298.844 124.000,299.200 123.733,299.200 123.400 C 299.200 123.070,299.487 122.800,299.837 122.800 C 300.188 122.800,300.569 122.440,300.684 122.000 C 300.799 121.560,301.204 121.200,301.585 121.200 C 301.965 121.200,302.602 120.840,303.000 120.400 C 303.398 119.960,303.960 119.600,304.248 119.600 C 304.536 119.600,304.965 119.240,305.200 118.800 C 305.435 118.360,305.880 118.000,306.187 118.000 C 306.495 118.000,306.860 117.640,307.000 117.200 C 307.140 116.760,307.512 116.400,307.827 116.400 C 308.142 116.400,308.400 116.040,308.400 115.600 C 308.400 115.067,308.667 114.800,309.200 114.800 C 309.640 114.800,310.360 114.440,310.800 114.000 C 311.240 113.560,311.887 113.200,312.237 113.200 C 312.588 113.200,312.969 112.840,313.084 112.400 C 313.200 111.957,313.630 111.600,314.047 111.600 C 314.533 111.600,314.800 111.317,314.800 110.800 C 314.800 110.267,315.067 110.000,315.600 110.000 C 316.133 110.000,316.400 109.733,316.400 109.200 C 316.400 108.682,316.667 108.400,317.157 108.400 C 317.574 108.400,318.012 108.147,318.130 107.838 C 318.249 107.528,318.883 107.157,319.540 107.013 C 320.196 106.869,320.833 106.492,320.954 106.176 C 321.076 105.859,321.438 105.600,321.760 105.600 C 322.083 105.600,322.460 105.240,322.600 104.800 C 322.740 104.360,323.100 104.000,323.400 104.000 C 323.700 104.000,324.048 103.680,324.172 103.288 C 324.296 102.897,324.938 102.372,325.599 102.123 C 326.905 101.630,327.277 100.158,326.200 99.745 C 325.870 99.618,325.600 99.105,325.600 98.604 C 325.600 98.030,325.304 97.616,324.800 97.484 C 324.360 97.369,324.000 96.988,324.000 96.637 C 324.000 96.287,323.773 96.000,323.496 96.000 C 323.219 96.000,322.768 95.640,322.493 95.200 C 322.218 94.760,321.725 94.400,321.397 94.400 C 321.068 94.400,320.800 94.150,320.800 93.845 C 320.800 93.526,320.202 93.177,319.400 93.026 C 318.562 92.869,318.000 92.530,318.000 92.182 C 318.000 91.862,317.640 91.600,317.200 91.600 C 316.667 91.600,316.400 91.333,316.400 90.800 C 316.400 90.267,316.133 90.000,315.600 90.000 C 315.067 90.000,314.800 89.733,314.800 89.200 C 314.800 88.683,314.533 88.400,314.047 88.400 C 313.630 88.400,313.200 88.043,313.084 87.600 C 312.924 86.987,312.538 86.800,311.437 86.800 C 310.267 86.800,310.000 86.652,310.000 86.000 C 310.000 85.467,309.733 85.200,309.200 85.200 C 308.683 85.200,308.400 84.933,308.400 84.447 C 308.400 84.030,308.043 83.600,307.600 83.484 C 307.160 83.369,306.800 82.988,306.800 82.637 C 306.800 82.267,306.465 82.000,306.000 82.000 C 305.560 82.000,305.200 81.749,305.200 81.443 C 305.200 80.831,304.359 80.400,303.167 80.400 C 302.667 80.400,302.400 80.122,302.400 79.600 C 302.400 79.083,302.133 78.800,301.647 78.800 C 301.230 78.800,300.800 78.443,300.684 78.000 C 300.569 77.560,300.188 77.200,299.837 77.200 C 299.487 77.200,299.200 76.930,299.200 76.600 C 299.200 76.270,298.861 76.000,298.447 76.000 C 298.030 76.000,297.600 75.643,297.484 75.200 C 297.324 74.587,296.938 74.400,295.837 74.400 C 294.667 74.400,294.400 74.252,294.400 73.600 C 294.400 73.067,294.133 72.800,293.600 72.800 C 293.067 72.800,292.800 72.533,292.800 72.000 C 292.800 71.467,292.533 71.200,292.000 71.200 C 291.467 71.200,291.200 70.933,291.200 70.400 C 291.200 69.883,290.933 69.600,290.447 69.600 C 290.030 69.600,289.600 69.243,289.484 68.800 C 289.332 68.217,288.938 68.000,288.037 68.000 C 287.067 68.000,286.800 67.828,286.800 67.200 C 286.800 66.667,286.533 66.400,286.000 66.400 C 285.467 66.400,285.200 66.133,285.200 65.600 C 285.200 65.083,284.933 64.800,284.447 64.800 C 284.030 64.800,283.600 64.443,283.484 64.000 C 283.369 63.560,283.007 63.200,282.680 63.200 C 282.353 63.200,281.986 62.940,281.864 62.622 C 281.742 62.304,281.003 61.924,280.221 61.778 C 279.189 61.584,278.800 61.304,278.800 60.755 C 278.800 60.267,278.518 60.000,278.000 60.000 C 277.556 60.000,277.200 59.733,277.200 59.400 C 277.200 59.067,276.844 58.800,276.400 58.800 C 275.867 58.800,275.600 58.533,275.600 58.000 C 275.600 57.467,275.333 57.200,274.800 57.200 C 274.267 57.200,274.000 56.933,274.000 56.400 C 274.000 55.752,273.733 55.600,272.600 55.600 C 271.467 55.600,271.200 55.448,271.200 54.800 C 271.200 54.267,270.933 54.000,270.400 54.000 C 269.867 54.000,269.600 53.733,269.600 53.200 C 269.600 52.667,269.333 52.400,268.800 52.400 C 268.267 52.400,268.000 52.133,268.000 51.600 C 268.000 51.103,267.733 50.800,267.296 50.800 C 266.909 50.800,266.368 50.440,266.093 50.000 C 265.774 49.490,265.160 49.200,264.397 49.200 C 263.467 49.200,263.200 49.022,263.200 48.400 C 263.200 47.867,262.933 47.600,262.400 47.600 C 261.867 47.600,261.600 47.333,261.600 46.800 C 261.600 46.267,261.333 46.000,260.800 46.000 C 260.335 46.000,260.000 45.733,260.000 45.363 C 260.000 45.012,259.640 44.631,259.200 44.516 C 258.760 44.401,258.400 44.078,258.400 43.798 C 258.400 43.518,257.770 43.171,257.000 43.026 C 256.162 42.869,255.600 42.530,255.600 42.182 C 255.600 41.862,255.240 41.600,254.800 41.600 C 254.267 41.600,254.000 41.333,254.000 40.800 C 254.000 40.267,253.733 40.000,253.200 40.000 C 252.667 40.000,252.400 39.733,252.400 39.200 C 252.400 38.683,252.133 38.400,251.647 38.400 C 251.230 38.400,250.800 38.043,250.684 37.600 C 250.524 36.987,250.138 36.800,249.037 36.800 C 247.867 36.800,247.600 36.652,247.600 36.000 C 247.600 35.467,247.333 35.200,246.800 35.200 C 246.267 35.200,246.000 34.933,246.000 34.400 C 246.000 33.867,245.733 33.600,245.200 33.600 C 244.667 33.600,244.400 33.333,244.400 32.800 C 244.400 32.267,244.133 32.000,243.600 32.000 C 243.160 32.000,242.800 31.749,242.800 31.443 C 242.800 30.840,241.962 30.400,240.814 30.400 C 240.418 30.400,239.999 30.040,239.884 29.600 C 239.769 29.160,239.409 28.800,239.084 28.800 C 238.759 28.800,238.399 28.440,238.284 28.000 C 238.169 27.560,237.788 27.200,237.437 27.200 C 237.087 27.200,236.800 26.930,236.800 26.600 C 236.800 26.270,236.461 26.000,236.047 26.000 C 235.630 26.000,235.200 25.643,235.084 25.200 C 234.924 24.587,234.538 24.400,233.437 24.400 C 232.267 24.400,232.000 24.252,232.000 23.600 C 232.000 23.067,231.733 22.800,231.200 22.800 C 230.667 22.800,230.400 22.533,230.400 22.000 C 230.400 21.467,230.133 21.200,229.600 21.200 C 229.067 21.200,228.800 20.933,228.800 20.400 C 228.800 19.883,228.533 19.600,228.047 19.600 C 227.630 19.600,227.200 19.243,227.084 18.800 C 226.934 18.226,226.538 18.000,225.684 18.000 C 224.830 18.000,224.434 17.774,224.284 17.200 C 224.169 16.760,223.809 16.400,223.484 16.400 C 223.159 16.400,222.799 16.040,222.684 15.600 C 222.569 15.160,222.188 14.800,221.837 14.800 C 221.487 14.800,221.200 14.526,221.200 14.190 C 221.200 13.855,220.750 13.409,220.200 13.200 C 219.650 12.991,219.200 12.644,219.200 12.428 C 219.200 12.213,218.587 11.921,217.837 11.781 C 216.968 11.618,216.401 11.248,216.274 10.762 C 216.165 10.343,215.788 10.000,215.437 10.000 C 215.087 10.000,214.800 9.730,214.800 9.400 C 214.800 9.067,214.444 8.800,214.000 8.800 C 213.467 8.800,213.200 8.533,213.200 8.000 C 213.200 7.483,212.933 7.200,212.447 7.200 C 212.030 7.200,211.600 6.843,211.484 6.400 C 211.324 5.787,210.938 5.600,209.837 5.600 C 208.667 5.600,208.400 5.452,208.400 4.800 C 208.400 4.360,208.151 4.000,207.847 4.000 C 207.542 4.000,207.199 3.640,207.084 3.200 C 206.969 2.760,206.609 2.400,206.284 2.400 C 205.959 2.400,205.599 2.040,205.484 1.600 C 205.369 1.160,204.988 0.800,204.637 0.800 C 204.287 0.800,204.000 0.620,204.000 0.400 C 204.000 0.178,202.933 0.000,201.600 0.000 L 199.200 0.000 199.200 37.200 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path2" d="M199.200 37.200 L 199.200 74.400 188.443 74.400 C 179.250 74.400,177.652 74.487,177.455 75.000 C 177.278 75.462,176.507 75.601,174.113 75.604 C 170.054 75.610,168.000 75.962,168.000 76.652 C 168.000 77.065,167.285 77.201,165.100 77.205 C 161.724 77.212,160.400 77.492,160.400 78.202 C 160.400 78.550,159.505 78.760,157.556 78.870 C 155.467 78.988,154.580 79.213,154.212 79.716 C 153.850 80.211,153.132 80.400,151.618 80.400 C 149.862 80.400,149.491 80.529,149.316 81.200 C 149.140 81.872,148.770 82.000,147.000 82.000 C 145.230 82.000,144.860 82.128,144.684 82.800 C 144.519 83.432,144.138 83.600,142.870 83.600 C 140.880 83.600,140.000 83.920,140.000 84.643 C 140.000 85.026,139.501 85.200,138.400 85.200 C 137.067 85.200,136.800 85.333,136.800 86.000 C 136.800 86.667,136.533 86.800,135.200 86.800 C 134.133 86.800,133.333 87.067,132.800 87.600 C 132.345 88.055,131.467 88.400,130.763 88.400 C 129.862 88.400,129.468 88.617,129.316 89.200 C 129.152 89.827,128.770 90.000,127.553 90.000 C 126.267 90.000,126.000 90.137,126.000 90.800 C 126.000 91.449,125.733 91.600,124.587 91.600 C 123.728 91.600,123.088 91.825,122.954 92.176 C 122.833 92.492,122.210 92.866,121.571 93.006 C 120.932 93.147,120.300 93.439,120.166 93.655 C 120.032 93.872,119.490 94.214,118.961 94.415 C 118.433 94.616,118.000 95.055,118.000 95.390 C 118.000 95.823,117.584 96.000,116.563 96.000 C 115.485 96.000,115.075 96.191,114.926 96.762 C 114.799 97.248,114.232 97.618,113.363 97.781 C 112.554 97.932,112.000 98.273,112.000 98.618 C 112.000 98.942,111.629 99.200,111.163 99.200 C 110.662 99.200,110.241 99.521,110.116 100.000 C 109.966 100.574,109.570 100.800,108.716 100.800 C 107.862 100.800,107.466 101.026,107.316 101.600 C 107.200 102.043,106.770 102.400,106.353 102.400 C 105.867 102.400,105.600 102.683,105.600 103.200 C 105.600 103.697,105.333 104.000,104.896 104.000 C 104.509 104.000,103.968 104.360,103.693 104.800 C 103.374 105.310,102.760 105.600,101.997 105.600 C 101.067 105.600,100.800 105.778,100.800 106.400 C 100.800 106.933,100.533 107.200,100.000 107.200 C 99.467 107.200,99.200 107.467,99.200 108.000 C 99.200 108.533,98.933 108.800,98.400 108.800 C 97.960 108.800,97.600 109.050,97.600 109.355 C 97.600 109.674,97.002 110.023,96.200 110.174 C 95.428 110.318,94.800 110.676,94.800 110.971 C 94.800 111.266,94.440 111.601,94.000 111.716 C 93.560 111.831,93.200 112.212,93.200 112.563 C 93.200 112.933,92.865 113.200,92.400 113.200 C 91.867 113.200,91.600 113.467,91.600 114.000 C 91.600 114.533,91.333 114.800,90.800 114.800 C 90.267 114.800,90.000 115.067,90.000 115.600 C 90.000 116.133,89.733 116.400,89.200 116.400 C 88.667 116.400,88.400 116.667,88.400 117.200 C 88.400 117.733,88.133 118.000,87.600 118.000 C 87.067 118.000,86.800 118.267,86.800 118.800 C 86.800 119.333,86.533 119.600,86.000 119.600 C 85.467 119.600,85.200 119.867,85.200 120.400 C 85.200 120.933,84.933 121.200,84.400 121.200 C 83.867 121.200,83.600 121.467,83.600 122.000 C 83.600 122.533,83.333 122.800,82.800 122.800 C 82.267 122.800,82.000 123.067,82.000 123.600 C 82.000 124.133,81.733 124.400,81.200 124.400 C 80.760 124.400,80.400 124.658,80.400 124.973 C 80.400 125.288,80.040 125.660,79.600 125.800 C 79.160 125.940,78.800 126.291,78.800 126.580 C 78.800 126.870,78.440 127.201,78.000 127.316 C 77.560 127.431,77.200 127.812,77.200 128.163 C 77.200 128.513,76.930 128.800,76.600 128.800 C 76.267 128.800,76.000 129.156,76.000 129.600 C 76.000 130.133,75.733 130.400,75.200 130.400 C 74.683 130.400,74.400 130.667,74.400 131.153 C 74.400 131.570,74.043 132.000,73.600 132.116 C 73.060 132.257,72.800 132.662,72.800 133.359 C 72.800 133.960,72.465 134.603,72.000 134.893 C 71.560 135.168,71.200 135.709,71.200 136.096 C 71.200 136.533,70.897 136.800,70.400 136.800 C 69.867 136.800,69.600 137.067,69.600 137.600 C 69.600 138.133,69.333 138.400,68.800 138.400 C 68.263 138.400,68.000 138.667,68.000 139.213 C 68.000 139.659,67.741 140.124,67.424 140.246 C 67.108 140.367,66.735 140.984,66.597 141.615 C 66.457 142.249,65.998 142.874,65.572 143.009 C 65.147 143.144,64.800 143.602,64.800 144.027 C 64.800 144.452,64.549 144.800,64.243 144.800 C 63.631 144.800,63.200 145.641,63.200 146.833 C 63.200 147.255,62.926 147.600,62.590 147.600 C 62.255 147.600,61.809 148.050,61.600 148.600 C 61.391 149.150,61.044 149.600,60.828 149.600 C 60.613 149.600,60.318 150.230,60.174 151.000 C 60.023 151.802,59.674 152.400,59.355 152.400 C 59.035 152.400,58.800 152.809,58.800 153.367 C 58.800 154.748,58.402 155.600,57.757 155.600 C 57.451 155.600,57.200 155.917,57.200 156.304 C 57.200 156.691,56.840 157.232,56.400 157.507 C 55.901 157.819,55.600 158.440,55.600 159.157 C 55.600 159.970,55.366 160.368,54.800 160.516 C 54.222 160.667,54.000 161.062,54.000 161.936 C 54.000 162.795,53.768 163.220,53.200 163.400 C 52.620 163.584,52.400 164.005,52.400 164.931 C 52.400 165.774,52.129 166.377,51.600 166.707 C 51.018 167.071,50.800 167.640,50.800 168.800 C 50.800 169.960,50.582 170.529,50.000 170.893 C 49.430 171.249,49.200 171.826,49.200 172.896 C 49.200 174.133,49.058 174.400,48.400 174.400 C 47.733 174.400,47.600 174.667,47.600 176.000 C 47.600 177.096,47.426 177.600,47.047 177.600 C 46.416 177.600,46.013 178.800,46.005 180.700 C 46.002 181.542,45.804 182.000,45.443 182.000 C 44.704 182.000,44.400 182.886,44.400 185.033 C 44.400 186.266,44.234 186.800,43.850 186.800 C 43.283 186.800,42.800 188.460,42.800 190.407 C 42.800 191.022,42.533 191.617,42.200 191.745 C 41.747 191.919,41.600 192.651,41.600 194.741 C 41.600 197.170,41.503 197.532,40.800 197.716 C 40.078 197.905,40.000 198.262,40.000 201.359 C 40.000 204.360,39.899 204.856,39.200 205.293 C 38.478 205.744,38.400 206.226,38.400 210.250 C 38.400 214.370,38.340 214.722,37.600 214.916 C 36.342 215.245,36.342 259.521,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.529 277.200,41.600 277.467,41.600 280.213 C 41.600 282.521,41.740 283.279,42.200 283.455 C 42.607 283.612,42.800 284.250,42.800 285.443 C 42.800 286.667,43.043 287.443,43.600 288.000 C 44.168 288.568,44.400 289.333,44.400 290.637 C 44.400 292.138,44.546 292.513,45.200 292.684 C 45.844 292.852,46.000 293.230,46.000 294.614 C 46.000 296.716,46.309 297.600,47.043 297.600 C 47.426 297.600,47.600 298.099,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.035 300.800,49.201 301.068,49.205 302.100 C 49.213 304.000,49.616 305.200,50.247 305.200 C 50.615 305.200,50.800 305.680,50.800 306.637 C 50.800 307.738,50.987 308.124,51.600 308.284 C 52.227 308.448,52.400 308.830,52.400 310.047 C 52.400 311.333,52.537 311.600,53.200 311.600 C 53.852 311.600,54.000 311.867,54.000 313.037 C 54.000 314.138,54.187 314.524,54.800 314.684 C 55.397 314.840,55.600 315.230,55.600 316.220 C 55.600 317.195,55.812 317.613,56.400 317.800 C 56.840 317.940,57.200 318.402,57.200 318.827 C 57.200 319.252,57.451 319.600,57.757 319.600 C 58.371 319.600,58.800 320.441,58.800 321.645 C 58.800 322.074,59.065 322.527,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 63.052 327.200,63.200 327.467,63.200 328.637 C 63.200 329.738,63.387 330.124,64.000 330.284 C 64.443 330.400,64.800 330.830,64.800 331.247 C 64.800 331.733,65.083 332.000,65.600 332.000 C 66.224 332.000,66.400 332.267,66.400 333.213 C 66.400 333.948,66.648 334.520,67.031 334.667 C 67.377 334.800,67.823 335.335,68.021 335.855 C 68.218 336.375,68.655 336.800,68.990 336.800 C 69.333 336.800,69.600 337.150,69.600 337.600 C 69.600 338.133,69.867 338.400,70.400 338.400 C 70.933 338.400,71.200 338.667,71.200 339.200 C 71.200 339.640,71.560 340.360,72.000 340.800 C 72.440 341.240,72.800 341.870,72.800 342.200 C 72.800 342.533,73.156 342.800,73.600 342.800 C 74.133 342.800,74.400 343.067,74.400 343.600 C 74.400 344.040,74.658 344.400,74.973 344.400 C 75.288 344.400,75.660 344.760,75.800 345.200 C 75.940 345.640,76.312 346.000,76.627 346.000 C 76.942 346.000,77.200 346.360,77.200 346.800 C 77.200 347.333,77.467 347.600,78.000 347.600 C 78.533 347.600,78.800 347.867,78.800 348.400 C 78.800 348.933,79.067 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.317 360.000,91.600 360.267,91.600 360.753 C 91.600 361.170,91.957 361.600,92.400 361.716 C 92.840 361.831,93.200 362.212,93.200 362.563 C 93.200 362.913,93.458 363.200,93.773 363.200 C 94.088 363.200,94.460 363.560,94.600 364.000 C 94.740 364.440,95.202 364.800,95.627 364.800 C 96.052 364.800,96.400 365.062,96.400 365.382 C 96.400 365.730,96.962 366.069,97.800 366.226 C 98.813 366.416,99.200 366.698,99.200 367.245 C 99.200 367.733,99.482 368.000,100.000 368.000 C 100.533 368.000,100.800 368.267,100.800 368.800 C 100.800 369.318,101.067 369.600,101.557 369.600 C 101.974 369.600,102.414 369.860,102.536 370.178 C 102.658 370.496,103.397 370.876,104.179 371.022 C 105.211 371.216,105.600 371.496,105.600 372.045 C 105.600 372.533,105.882 372.800,106.400 372.800 C 106.840 372.800,107.200 373.050,107.200 373.355 C 107.200 373.674,107.798 374.023,108.600 374.174 C 109.438 374.331,110.000 374.670,110.000 375.018 C 110.000 375.338,110.348 375.600,110.773 375.600 C 111.198 375.600,111.660 375.960,111.800 376.400 C 111.989 376.995,112.405 377.200,113.427 377.200 C 114.533 377.200,114.800 377.355,114.800 378.000 C 114.800 378.622,115.067 378.800,115.997 378.800 C 116.760 378.800,117.374 379.090,117.693 379.600 C 117.968 380.040,118.488 380.400,118.850 380.400 C 119.211 380.400,119.601 380.760,119.716 381.200 C 119.876 381.813,120.262 382.000,121.363 382.000 C 122.533 382.000,122.800 382.148,122.800 382.800 C 122.800 383.467,123.067 383.600,124.400 383.600 C 125.733 383.600,126.000 383.733,126.000 384.400 C 126.000 385.045,126.267 385.200,127.373 385.200 C 128.395 385.200,128.811 385.405,129.000 386.000 C 129.187 386.589,129.605 386.800,130.584 386.800 C 131.375 386.800,132.004 387.034,132.136 387.378 C 132.258 387.696,133.042 388.082,133.879 388.236 C 134.716 388.390,135.829 388.850,136.354 389.258 C 136.879 389.666,137.914 390.000,138.654 390.000 C 139.528 390.000,140.000 390.192,140.000 390.549 C 140.000 390.918,140.675 391.163,142.054 391.296 C 143.383 391.423,144.238 391.724,144.474 392.146 C 144.743 392.627,145.419 392.800,147.020 392.800 C 148.933 392.800,149.200 392.898,149.200 393.600 C 149.200 394.311,149.467 394.400,151.600 394.400 C 153.733 394.400,154.000 394.489,154.000 395.200 C 154.000 395.928,154.267 396.000,156.973 396.000 C 159.595 396.000,159.976 396.095,160.200 396.800 C 160.423 397.504,160.805 397.600,163.380 397.600 C 165.970 397.600,166.331 397.692,166.516 398.400 C 166.710 399.142,167.062 399.200,171.363 399.200 C 174.188 399.200,176.000 399.356,176.000 399.600 C 176.000 399.862,184.267 400.000,200.000 400.000 C 215.733 400.000,224.000 399.862,224.000 399.600 C 224.000 399.356,225.812 399.200,228.637 399.200 C 232.938 399.200,233.290 399.142,233.484 398.400 C 233.671 397.685,234.030 397.600,236.843 397.600 C 239.560 397.600,240.062 397.490,240.493 396.800 C 240.906 396.138,241.426 396.000,243.496 396.000 C 245.733 396.000,246.000 395.915,246.000 395.200 C 246.000 394.489,246.267 394.400,248.400 394.400 C 250.267 394.400,250.978 394.222,251.600 393.600 C 252.107 393.093,252.933 392.800,253.856 392.800 C 254.729 392.800,255.499 392.544,255.780 392.159 C 256.043 391.800,257.073 391.426,258.124 391.307 C 259.239 391.182,260.000 390.894,260.000 390.599 C 260.000 390.293,260.790 390.026,262.054 389.904 C 263.383 389.777,264.238 389.476,264.474 389.054 C 264.675 388.694,265.266 388.400,265.787 388.400 C 267.149 388.400,268.000 387.999,268.000 387.357 C 268.000 386.984,268.475 386.800,269.437 386.800 C 270.538 386.800,270.924 386.613,271.084 386.000 C 271.241 385.399,271.630 385.200,272.647 385.200 C 273.733 385.200,274.000 385.042,274.000 384.400 C 274.000 383.733,274.267 383.600,275.600 383.600 C 276.933 383.600,277.200 383.467,277.200 382.800 C 277.200 382.133,277.467 382.000,278.800 382.000 C 280.133 382.000,280.400 381.867,280.400 381.200 C 280.400 380.578,280.667 380.400,281.597 380.400 C 282.360 380.400,282.974 380.110,283.293 379.600 C 283.568 379.160,284.109 378.800,284.496 378.800 C 284.933 378.800,285.200 378.497,285.200 378.000 C 285.200 377.348,285.467 377.200,286.637 377.200 C 287.738 377.200,288.124 377.013,288.284 376.400 C 288.400 375.955,288.830 375.600,289.251 375.600 C 289.667 375.600,290.316 375.240,290.693 374.800 C 291.070 374.360,291.698 374.000,292.089 374.000 C 292.480 374.000,292.800 373.730,292.800 373.400 C 292.800 373.067,293.156 372.800,293.600 372.800 C 294.133 372.800,294.400 372.533,294.400 372.000 C 294.400 371.421,294.667 371.200,295.367 371.200 C 296.748 371.200,297.600 370.802,297.600 370.157 C 297.600 369.851,297.960 369.600,298.400 369.600 C 298.933 369.600,299.200 369.333,299.200 368.800 C 299.200 368.267,299.467 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.576,301.067 366.400,302.013 366.400 C 302.748 366.400,303.320 366.152,303.467 365.769 C 303.600 365.423,304.135 364.977,304.655 364.779 C 305.175 364.582,305.600 364.166,305.600 363.857 C 305.600 363.547,305.960 363.199,306.400 363.084 C 306.840 362.969,307.200 362.588,307.200 362.237 C 307.200 361.887,307.470 361.600,307.800 361.600 C 308.133 361.600,308.400 361.244,308.400 360.800 C 308.400 360.267,308.667 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.232,311.600 358.027 C 311.600 357.822,311.916 357.554,312.302 357.431 C 313.725 356.979,321.200 349.174,321.200 348.139 C 321.200 347.843,321.560 347.600,322.000 347.600 C 322.533 347.600,322.800 347.333,322.800 346.800 C 322.800 346.360,323.058 346.000,323.373 346.000 C 323.688 346.000,324.060 345.640,324.200 345.200 C 324.340 344.760,324.712 344.400,325.027 344.400 C 325.342 344.400,325.600 344.040,325.600 343.600 C 325.600 343.067,325.867 342.800,326.400 342.800 C 326.933 342.800,327.200 342.533,327.200 342.000 C 327.200 341.467,327.467 341.200,328.000 341.200 C 328.648 341.200,328.800 340.933,328.800 339.800 C 328.800 338.667,328.952 338.400,329.600 338.400 C 330.133 338.400,330.400 338.133,330.400 337.600 C 330.400 337.067,330.667 336.800,331.200 336.800 C 331.717 336.800,332.000 336.533,332.000 336.047 C 332.000 335.630,332.357 335.200,332.800 335.084 C 333.413 334.924,333.600 334.538,333.600 333.437 C 333.600 332.267,333.748 332.000,334.400 332.000 C 334.917 332.000,335.200 331.733,335.200 331.247 C 335.200 330.830,335.557 330.400,336.000 330.284 C 336.540 330.143,336.800 329.738,336.800 329.041 C 336.800 328.440,337.135 327.797,337.600 327.507 C 338.040 327.232,338.400 326.691,338.400 326.304 C 338.400 325.917,338.662 325.600,338.982 325.600 C 339.330 325.600,339.669 325.038,339.826 324.200 C 339.977 323.398,340.326 322.800,340.645 322.800 C 340.950 322.800,341.200 322.446,341.200 322.014 C 341.200 321.582,341.560 321.035,342.000 320.800 C 342.513 320.526,342.800 319.962,342.800 319.233 C 342.800 318.430,343.036 318.032,343.600 317.884 C 344.213 317.724,344.400 317.338,344.400 316.237 C 344.400 315.067,344.548 314.800,345.200 314.800 C 345.867 314.800,346.000 314.533,346.000 313.200 C 346.000 311.867,346.133 311.600,346.800 311.600 C 347.467 311.600,347.600 311.333,347.600 310.000 C 347.600 308.667,347.733 308.400,348.400 308.400 C 349.052 308.400,349.200 308.133,349.200 306.963 C 349.200 305.862,349.387 305.476,350.000 305.316 C 350.601 305.159,350.800 304.770,350.800 303.753 C 350.800 302.933,351.115 302.085,351.600 301.600 C 352.125 301.075,352.400 300.267,352.400 299.247 C 352.400 298.030,352.573 297.648,353.200 297.484 C 353.853 297.313,354.000 296.938,354.000 295.441 C 354.000 294.040,354.189 293.489,354.800 293.107 C 355.409 292.727,355.600 292.174,355.600 290.793 C 355.600 289.473,355.818 288.791,356.400 288.293 C 357.002 287.777,357.200 287.113,357.200 285.604 C 357.200 284.089,357.347 283.600,357.800 283.600 C 358.267 283.600,358.400 283.067,358.400 281.200 C 358.400 279.333,358.578 278.622,359.200 278.000 C 359.856 277.344,360.000 276.667,360.000 274.247 C 360.000 271.630,360.091 271.269,360.800 271.084 C 361.542 270.890,361.600 270.538,361.600 266.237 C 361.600 261.867,361.646 261.600,362.400 261.600 C 363.175 261.600,363.200 261.333,363.200 253.020 C 363.200 245.264,363.267 244.402,363.900 244.048 C 364.462 243.733,364.628 242.982,364.741 240.228 L 364.882 236.800 338.241 236.800 L 311.600 236.800 311.600 239.469 C 311.600 241.449,311.419 242.336,310.900 242.910 C 310.316 243.554,310.177 244.652,310.061 249.526 C 309.962 253.669,309.771 255.490,309.406 255.785 C 309.096 256.035,308.807 257.537,308.679 259.565 C 308.522 262.060,308.303 263.023,307.833 263.285 C 307.344 263.559,307.200 264.317,307.200 266.620 C 307.200 269.333,307.128 269.600,306.400 269.600 C 305.689 269.600,305.600 269.867,305.600 272.000 C 305.600 274.133,305.511 274.400,304.800 274.400 C 304.137 274.400,304.000 274.667,304.000 275.953 C 304.000 277.170,303.827 277.552,303.200 277.716 C 302.532 277.891,302.400 278.262,302.400 279.963 C 302.400 281.733,302.295 282.000,301.600 282.000 C 300.933 282.000,300.800 282.267,300.800 283.600 C 300.800 284.933,300.667 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.733 288.400,297.600 288.667,297.600 290.000 C 297.600 291.333,297.467 291.600,296.800 291.600 C 296.282 291.600,296.000 291.867,296.000 292.357 C 296.000 292.774,295.747 293.212,295.438 293.330 C 295.128 293.449,294.754 294.098,294.606 294.773 C 294.458 295.448,294.097 296.000,293.803 296.000 C 293.493 296.000,293.157 296.669,293.000 297.600 C 292.834 298.584,292.512 299.200,292.165 299.200 C 291.854 299.200,291.600 299.560,291.600 300.000 C 291.600 300.533,291.333 300.800,290.800 300.800 C 290.271 300.800,290.000 301.067,290.000 301.586 C 290.000 302.018,289.640 302.565,289.200 302.800 C 288.676 303.080,288.400 303.638,288.400 304.414 C 288.400 305.333,288.220 305.600,287.600 305.600 C 287.067 305.600,286.800 305.867,286.800 306.400 C 286.800 306.933,286.533 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.867 308.800,283.600 309.067,283.600 309.600 C 283.600 310.052,283.333 310.400,282.987 310.400 C 282.651 310.400,282.263 310.692,282.126 311.050 C 281.989 311.407,281.186 312.442,280.343 313.350 C 279.500 314.257,278.808 315.315,278.805 315.700 C 278.802 316.132,278.493 316.400,278.000 316.400 C 277.544 316.400,277.200 316.667,277.200 317.021 C 277.200 317.362,276.660 317.830,276.000 318.060 C 275.340 318.290,274.800 318.645,274.800 318.849 C 274.800 319.053,274.350 319.391,273.800 319.600 C 273.250 319.809,272.800 320.255,272.800 320.590 C 272.800 320.933,272.450 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.133,269.333 324.400,268.800 324.400 C 268.360 324.400,268.000 324.656,268.000 324.968 C 268.000 325.281,267.448 325.658,266.773 325.806 C 266.098 325.954,265.455 326.312,265.344 326.602 C 265.233 326.891,264.705 327.237,264.171 327.372 C 263.637 327.506,263.200 327.861,263.200 328.161 C 263.200 328.461,262.840 328.801,262.400 328.916 C 261.960 329.031,261.600 329.412,261.600 329.763 C 261.600 330.224,261.214 330.400,260.200 330.400 C 259.094 330.400,258.800 330.559,258.800 331.155 C 258.800 331.704,258.411 331.984,257.379 332.178 C 256.597 332.324,255.858 332.704,255.736 333.022 C 255.614 333.340,255.174 333.600,254.757 333.600 C 254.267 333.600,254.000 333.882,254.000 334.400 C 254.000 335.067,253.733 335.200,252.400 335.200 C 251.067 335.200,250.800 335.333,250.800 336.000 C 250.800 336.667,250.533 336.800,249.200 336.800 C 247.867 336.800,247.600 336.933,247.600 337.600 C 247.600 338.252,247.333 338.400,246.163 338.400 C 245.062 338.400,244.676 338.587,244.516 339.200 C 244.342 339.865,243.970 340.000,242.316 340.000 C 240.662 340.000,240.290 340.135,240.116 340.800 C 239.952 341.427,239.570 341.600,238.353 341.600 C 237.239 341.600,236.800 341.770,236.800 342.200 C 236.800 342.643,236.337 342.800,235.033 342.800 C 232.886 342.800,232.000 343.104,232.000 343.843 C 232.000 344.256,231.389 344.400,229.633 344.400 C 226.940 344.400,226.000 344.659,226.000 345.403 C 226.000 345.778,225.000 345.959,222.368 346.060 C 219.478 346.171,218.630 346.343,218.223 346.900 C 217.776 347.512,216.970 347.600,211.818 347.600 C 206.262 347.600,205.913 347.646,205.716 348.400 C 205.519 349.151,205.170 349.200,200.000 349.200 C 194.830 349.200,194.481 349.151,194.284 348.400 C 194.087 347.646,193.738 347.600,188.237 347.600 C 182.933 347.600,182.327 347.527,181.600 346.800 C 180.925 346.125,180.267 346.000,177.400 346.000 C 174.761 346.000,174.000 345.875,174.000 345.443 C 174.000 344.679,173.105 344.400,170.656 344.400 C 169.073 344.400,168.415 344.209,167.893 343.600 C 167.423 343.051,166.713 342.800,165.632 342.800 C 164.766 342.800,163.787 342.530,163.457 342.200 C 163.127 341.870,162.214 341.600,161.429 341.600 C 160.267 341.600,160.000 341.451,160.000 340.800 C 160.000 340.119,159.733 340.000,158.203 340.000 C 156.840 340.000,156.286 339.807,155.907 339.200 C 155.551 338.630,154.974 338.400,153.904 338.400 C 152.667 338.400,152.400 338.258,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.333,148.933 335.200,147.600 335.200 C 146.267 335.200,146.000 335.067,146.000 334.400 C 146.000 333.867,145.733 333.600,145.200 333.600 C 144.760 333.600,144.400 333.349,144.400 333.043 C 144.400 332.398,143.548 332.000,142.167 332.000 C 141.467 332.000,141.200 331.779,141.200 331.200 C 141.200 330.667,140.933 330.400,140.400 330.400 C 139.960 330.400,139.240 330.040,138.800 329.600 C 138.360 329.160,137.730 328.800,137.400 328.800 C 137.070 328.800,136.800 328.526,136.800 328.190 C 136.800 327.855,136.350 327.409,135.800 327.200 C 135.250 326.991,134.800 326.655,134.800 326.454 C 134.800 326.253,134.170 325.971,133.400 325.826 C 132.562 325.669,132.000 325.330,132.000 324.982 C 132.000 324.662,131.640 324.400,131.200 324.400 C 130.667 324.400,130.400 324.133,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.935 319.600,125.600 319.333,125.600 318.963 C 125.600 318.612,125.240 318.231,124.800 318.116 C 124.360 318.001,124.000 317.658,124.000 317.353 C 124.000 317.049,123.852 316.800,123.672 316.800 C 123.141 316.800,120.800 314.570,120.800 314.064 C 120.800 313.809,120.542 313.600,120.227 313.600 C 119.912 313.600,119.540 313.240,119.400 312.800 C 119.260 312.360,118.888 312.000,118.573 312.000 C 118.258 312.000,118.000 311.661,118.000 311.247 C 118.000 310.830,117.643 310.400,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.467 307.200,113.200 306.933,113.200 306.400 C 113.200 305.867,112.933 305.600,112.400 305.600 C 111.748 305.600,111.600 305.333,111.600 304.163 C 111.600 303.062,111.413 302.676,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.576 300.800,108.400 300.533,108.400 299.587 C 108.400 298.913,108.150 298.279,107.836 298.159 C 107.526 298.039,107.163 297.505,107.028 296.971 C 106.894 296.437,106.538 296.000,106.237 296.000 C 105.927 296.000,105.575 295.391,105.426 294.600 C 105.269 293.762,104.930 293.200,104.582 293.200 C 104.262 293.200,104.000 292.874,104.000 292.475 C 104.000 292.077,103.640 291.364,103.200 290.892 C 102.760 290.420,102.400 289.666,102.400 289.217 C 102.400 288.667,102.139 288.400,101.600 288.400 C 100.933 288.400,100.800 288.133,100.800 286.800 C 100.800 285.467,100.667 285.200,100.000 285.200 C 99.333 285.200,99.200 284.933,99.200 283.600 C 99.200 282.533,98.933 281.733,98.400 281.200 C 97.911 280.711,97.600 279.867,97.600 279.027 C 97.600 278.005,97.395 277.589,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.523 272.739,94.400 272.370,94.400 270.516 C 94.400 268.662,94.277 268.293,93.600 268.116 C 92.916 267.937,92.800 267.570,92.800 265.582 C 92.800 263.998,92.599 263.056,92.169 262.626 C 91.756 262.213,91.457 260.928,91.304 258.904 C 91.172 257.152,90.839 255.581,90.535 255.278 C 89.583 254.326,89.645 221.098,90.600 220.143 C 90.865 219.878,91.181 218.212,91.302 216.441 C 91.452 214.262,91.730 213.013,92.161 212.581 C 92.614 212.129,92.800 211.193,92.800 209.371 C 92.800 207.067,92.883 206.800,93.600 206.800 C 94.302 206.800,94.400 206.533,94.400 204.627 C 94.400 202.805,94.529 202.413,95.200 202.200 C 95.871 201.987,96.000 201.595,96.000 199.773 C 96.000 197.867,96.098 197.600,96.800 197.600 C 97.463 197.600,97.600 197.333,97.600 196.047 C 97.600 194.830,97.773 194.448,98.400 194.284 C 99.052 194.113,99.200 193.738,99.200 192.252 C 99.200 190.838,99.380 190.332,100.000 190.000 C 100.440 189.765,100.800 189.246,100.800 188.848 C 100.800 188.450,101.160 187.798,101.600 187.400 C 102.040 187.002,102.400 186.254,102.400 185.738 C 102.400 185.184,102.638 184.800,102.982 184.800 C 103.330 184.800,103.669 184.238,103.826 183.400 C 103.971 182.630,104.320 182.000,104.602 182.000 C 105.199 182.000,105.600 181.121,105.600 179.814 C 105.600 179.230,105.892 178.817,106.400 178.684 C 106.840 178.569,107.200 178.188,107.200 177.837 C 107.200 177.487,107.470 177.200,107.800 177.200 C 108.217 177.200,108.400 176.781,108.400 175.827 C 108.400 174.805,108.605 174.389,109.200 174.200 C 109.640 174.060,110.000 173.700,110.000 173.400 C 110.000 173.100,110.360 172.740,110.800 172.600 C 111.240 172.460,111.600 172.088,111.600 171.773 C 111.600 171.458,111.960 170.840,112.400 170.400 C 112.840 169.960,113.200 169.240,113.200 168.800 C 113.200 168.267,113.467 168.000,114.000 168.000 C 114.533 168.000,114.800 167.733,114.800 167.200 C 114.800 166.667,115.067 166.400,115.600 166.400 C 116.133 166.400,116.400 166.133,116.400 165.600 C 116.400 165.067,116.667 164.800,117.200 164.800 C 117.717 164.800,118.000 164.533,118.000 164.047 C 118.000 163.630,118.357 163.200,118.800 163.084 C 119.240 162.969,119.600 162.588,119.600 162.237 C 119.600 161.887,119.858 161.600,120.173 161.600 C 120.488 161.600,120.860 161.240,121.000 160.800 C 121.140 160.360,121.512 160.000,121.827 160.000 C 122.142 160.000,122.400 159.640,122.400 159.200 C 122.400 158.667,122.667 158.400,123.200 158.400 C 123.665 158.400,124.000 158.133,124.000 157.763 C 124.000 157.412,124.360 157.031,124.800 156.916 C 125.240 156.801,125.600 156.479,125.600 156.200 C 125.600 155.921,125.960 155.599,126.400 155.484 C 126.840 155.369,127.200 154.988,127.200 154.637 C 127.200 154.267,127.535 154.000,128.000 154.000 C 128.533 154.000,128.800 153.733,128.800 153.200 C 128.800 152.667,129.067 152.400,129.600 152.400 C 130.133 152.400,130.400 152.133,130.400 151.600 C 130.400 151.067,130.667 150.800,131.200 150.800 C 131.640 150.800,132.360 150.440,132.800 150.000 C 133.240 149.560,133.887 149.200,134.237 149.200 C 134.588 149.200,134.969 148.840,135.084 148.400 C 135.200 147.957,135.630 147.600,136.047 147.600 C 136.533 147.600,136.800 147.317,136.800 146.800 C 136.800 146.172,137.067 146.000,138.037 146.000 C 138.938 146.000,139.332 145.783,139.484 145.200 C 139.600 144.757,140.030 144.400,140.447 144.400 C 140.933 144.400,141.200 144.117,141.200 143.600 C 141.200 142.933,141.467 142.800,142.800 142.800 C 144.133 142.800,144.400 142.667,144.400 142.000 C 144.400 141.352,144.667 141.200,145.800 141.200 C 146.570 141.200,147.200 141.022,147.200 140.805 C 147.200 140.588,147.808 140.157,148.551 139.846 C 149.294 139.536,150.025 139.083,150.175 138.841 C 150.325 138.598,150.790 138.400,151.210 138.400 C 151.629 138.400,152.165 138.040,152.400 137.600 C 152.699 137.042,153.238 136.800,154.181 136.800 C 155.930 136.800,156.800 136.454,156.800 135.757 C 156.800 135.374,157.299 135.200,158.400 135.200 C 159.733 135.200,160.000 135.067,160.000 134.400 C 160.000 133.695,160.267 133.600,162.237 133.600 C 164.138 133.600,164.506 133.480,164.684 132.800 C 164.860 132.127,165.230 132.000,167.020 132.000 C 168.795 132.000,169.188 131.868,169.400 131.200 C 169.619 130.509,170.005 130.400,172.224 130.400 C 174.360 130.400,174.877 130.265,175.293 129.600 C 175.723 128.912,176.226 128.800,178.896 128.800 C 181.467 128.800,182.137 128.663,182.800 128.000 C 183.545 127.255,184.133 127.200,191.400 127.200 L 199.200 127.200 199.200 164.000 L 199.200 200.800 201.373 200.800 C 203.153 200.800,203.589 200.663,203.786 200.043 C 203.918 199.627,204.381 199.194,204.813 199.081 C 205.246 198.967,205.600 198.609,205.600 198.284 C 205.600 197.959,205.960 197.599,206.400 197.484 C 206.840 197.369,207.200 196.988,207.200 196.637 C 207.200 196.287,207.430 196.000,207.712 196.000 C 207.993 196.000,208.483 195.640,208.800 195.200 C 209.139 194.730,209.835 194.400,210.488 194.400 C 211.333 194.400,211.600 194.208,211.600 193.600 C 211.600 193.067,211.867 192.800,212.400 192.800 C 212.933 192.800,213.200 192.533,213.200 192.000 C 213.200 191.467,213.467 191.200,214.000 191.200 C 214.444 191.200,214.800 190.933,214.800 190.600 C 214.800 190.270,215.064 190.000,215.386 190.000 C 215.708 190.000,216.165 189.640,216.400 189.200 C 216.635 188.760,217.182 188.400,217.614 188.400 C 218.046 188.400,218.729 188.071,219.131 187.669 C 219.532 187.268,220.162 186.823,220.531 186.682 C 220.899 186.541,221.200 186.170,221.200 185.859 C 221.200 185.548,221.560 185.199,222.000 185.084 C 222.440 184.969,222.800 184.588,222.800 184.237 C 222.800 183.887,223.064 183.600,223.386 183.600 C 223.708 183.600,224.165 183.240,224.400 182.800 C 224.680 182.276,225.238 182.000,226.014 182.000 C 226.933 182.000,227.200 181.820,227.200 181.200 C 227.200 180.667,227.467 180.400,228.000 180.400 C 228.533 180.400,228.800 180.133,228.800 179.600 C 228.800 179.067,229.067 178.800,229.600 178.800 C 230.133 178.800,230.400 178.533,230.400 178.000 C 230.400 177.467,230.667 177.200,231.200 177.200 C 231.640 177.200,232.360 176.840,232.800 176.400 C 233.240 175.960,233.887 175.600,234.237 175.600 C 234.588 175.600,234.969 175.240,235.084 174.800 C 235.200 174.357,235.630 174.000,236.047 174.000 C 236.461 174.000,236.800 173.751,236.800 173.447 C 236.800 173.142,237.160 172.799,237.600 172.684 C 238.040 172.569,238.400 172.188,238.400 171.837 C 238.400 171.487,238.636 171.200,238.925 171.200 C 239.213 171.200,239.836 170.840,240.308 170.400 C 240.780 169.960,241.461 169.600,241.821 169.600 C 242.181 169.600,242.569 169.240,242.684 168.800 C 242.800 168.357,243.230 168.000,243.647 168.000 C 244.133 168.000,244.400 167.717,244.400 167.200 C 244.400 166.667,244.667 166.400,245.200 166.400 C 245.733 166.400,246.000 166.133,246.000 165.600 C 246.000 165.067,246.267 164.800,246.800 164.800 C 247.240 164.800,247.960 164.440,248.400 164.000 C 248.840 163.560,249.487 163.200,249.837 163.200 C 250.188 163.200,250.569 162.840,250.684 162.400 C 250.800 161.957,251.230 161.600,251.647 161.600 C 252.133 161.600,252.400 161.317,252.400 160.800 C 252.400 160.267,252.667 160.000,253.200 160.000 C 253.733 160.000,254.000 159.733,254.000 159.200 C 254.000 158.665,254.267 158.400,254.804 158.400 C 255.246 158.400,255.916 158.040,256.293 157.600 C 256.670 157.160,257.298 156.800,257.689 156.800 C 258.080 156.800,258.400 156.551,258.400 156.247 C 258.400 155.942,258.760 155.599,259.200 155.484 C 259.640 155.369,260.000 154.988,260.000 154.637 C 260.000 154.267,260.335 154.000,260.800 154.000 C 261.333 154.000,261.600 153.733,261.600 153.200 C 261.600 152.703,261.867 152.400,262.304 152.400 C 262.691 152.400,263.232 152.040,263.507 151.600 C 263.797 151.135,264.440 150.800,265.041 150.800 C 265.738 150.800,266.143 150.540,266.284 150.000 C 266.400 149.557,266.830 149.200,267.247 149.200 C 267.733 149.200,268.000 148.917,268.000 148.400 C 268.000 147.867,268.267 147.600,268.800 147.600 C 269.333 147.600,269.600 147.333,269.600 146.800 C 269.600 146.303,269.867 146.000,270.304 146.000 C 270.691 146.000,271.232 145.640,271.507 145.200 C 271.790 144.748,272.440 144.400,273.003 144.400 C 273.733 144.400,274.000 144.186,274.000 143.600 C 274.000 143.067,274.267 142.800,274.800 142.800 C 275.333 142.800,275.600 142.533,275.600 142.000 C 275.600 141.467,275.867 141.200,276.400 141.200 C 276.844 141.200,277.200 140.933,277.200 140.600 C 277.200 140.270,277.517 140.000,277.904 140.000 C 278.291 140.000,278.822 139.656,279.085 139.236 C 279.347 138.816,280.110 138.351,280.781 138.204 C 281.451 138.057,282.000 137.681,282.000 137.368 C 282.000 137.056,282.287 136.800,282.637 136.800 C 282.988 136.800,283.369 136.440,283.484 136.000 C 283.600 135.557,284.030 135.200,284.447 135.200 C 284.933 135.200,285.200 134.917,285.200 134.400 C 285.200 133.903,285.467 133.600,285.904 133.600 C 286.291 133.600,286.832 133.240,287.107 132.800 C 287.390 132.348,288.040 132.000,288.603 132.000 C 289.333 132.000,289.600 131.786,289.600 131.200 C 289.600 130.667,289.867 130.400,290.400 130.400 C 290.933 130.400,291.200 130.133,291.200 129.600 C 291.200 129.067,291.467 128.800,292.000 128.800 C 292.533 128.800,292.800 128.533,292.800 128.000 C 292.800 127.500,293.067 127.200,293.512 127.200 C 293.903 127.200,294.483 126.840,294.800 126.400 C 295.139 125.930,295.835 125.600,296.488 125.600 C 297.333 125.600,297.600 125.408,297.600 124.800 C 297.600 124.267,297.867 124.000,298.400 124.000 C 298.844 124.000,299.200 123.733,299.200 123.400 C 299.200 123.070,299.487 122.800,299.837 122.800 C 300.188 122.800,300.569 122.440,300.684 122.000 C 300.799 121.560,301.204 121.200,301.585 121.200 C 301.965 121.200,302.602 120.840,303.000 120.400 C 303.398 119.960,303.960 119.600,304.248 119.600 C 304.536 119.600,304.965 119.240,305.200 118.800 C 305.435 118.360,305.880 118.000,306.187 118.000 C 306.495 118.000,306.860 117.640,307.000 117.200 C 307.140 116.760,307.512 116.400,307.827 116.400 C 308.142 116.400,308.400 116.040,308.400 115.600 C 308.400 115.067,308.667 114.800,309.200 114.800 C 309.640 114.800,310.360 114.440,310.800 114.000 C 311.240 113.560,311.887 113.200,312.237 113.200 C 312.588 113.200,312.969 112.840,313.084 112.400 C 313.200 111.957,313.630 111.600,314.047 111.600 C 314.533 111.600,314.800 111.317,314.800 110.800 C 314.800 110.267,315.067 110.000,315.600 110.000 C 316.133 110.000,316.400 109.733,316.400 109.200 C 316.400 108.682,316.667 108.400,317.157 108.400 C 317.574 108.400,318.012 108.147,318.130 107.838 C 318.249 107.528,318.883 107.157,319.540 107.013 C 320.196 106.869,320.833 106.492,320.954 106.176 C 321.076 105.859,321.438 105.600,321.760 105.600 C 322.083 105.600,322.460 105.240,322.600 104.800 C 322.740 104.360,323.100 104.000,323.400 104.000 C 323.700 104.000,324.048 103.680,324.172 103.288 C 324.296 102.897,324.938 102.372,325.599 102.123 C 326.905 101.630,327.277 100.158,326.200 99.745 C 325.870 99.618,325.600 99.105,325.600 98.604 C 325.600 98.030,325.304 97.616,324.800 97.484 C 324.360 97.369,324.000 96.988,324.000 96.637 C 324.000 96.287,323.773 96.000,323.496 96.000 C 323.219 96.000,322.768 95.640,322.493 95.200 C 322.218 94.760,321.725 94.400,321.397 94.400 C 321.068 94.400,320.800 94.150,320.800 93.845 C 320.800 93.526,320.202 93.177,319.400 93.026 C 318.562 92.869,318.000 92.530,318.000 92.182 C 318.000 91.862,317.640 91.600,317.200 91.600 C 316.667 91.600,316.400 91.333,316.400 90.800 C 316.400 90.267,316.133 90.000,315.600 90.000 C 315.067 90.000,314.800 89.733,314.800 89.200 C 314.800 88.683,314.533 88.400,314.047 88.400 C 313.630 88.400,313.200 88.043,313.084 87.600 C 312.924 86.987,312.538 86.800,311.437 86.800 C 310.267 86.800,310.000 86.652,310.000 86.000 C 310.000 85.467,309.733 85.200,309.200 85.200 C 308.683 85.200,308.400 84.933,308.400 84.447 C 308.400 84.030,308.043 83.600,307.600 83.484 C 307.160 83.369,306.800 82.988,306.800 82.637 C 306.800 82.267,306.465 82.000,306.000 82.000 C 305.560 82.000,305.200 81.749,305.200 81.443 C 305.200 80.831,304.359 80.400,303.167 80.400 C 302.667 80.400,302.400 80.122,302.400 79.600 C 302.400 79.083,302.133 78.800,301.647 78.800 C 301.230 78.800,300.800 78.443,300.684 78.000 C 300.569 77.560,300.188 77.200,299.837 77.200 C 299.487 77.200,299.200 76.930,299.200 76.600 C 299.200 76.270,298.861 76.000,298.447 76.000 C 298.030 76.000,297.600 75.643,297.484 75.200 C 297.324 74.587,296.938 74.400,295.837 74.400 C 294.667 74.400,294.400 74.252,294.400 73.600 C 294.400 73.067,294.133 72.800,293.600 72.800 C 293.067 72.800,292.800 72.533,292.800 72.000 C 292.800 71.467,292.533 71.200,292.000 71.200 C 291.467 71.200,291.200 70.933,291.200 70.400 C 291.200 69.883,290.933 69.600,290.447 69.600 C 290.030 69.600,289.600 69.243,289.484 68.800 C 289.332 68.217,288.938 68.000,288.037 68.000 C 287.067 68.000,286.800 67.828,286.800 67.200 C 286.800 66.667,286.533 66.400,286.000 66.400 C 285.467 66.400,285.200 66.133,285.200 65.600 C 285.200 65.083,284.933 64.800,284.447 64.800 C 284.030 64.800,283.600 64.443,283.484 64.000 C 283.369 63.560,283.007 63.200,282.680 63.200 C 282.353 63.200,281.986 62.940,281.864 62.622 C 281.742 62.304,281.003 61.924,280.221 61.778 C 279.189 61.584,278.800 61.304,278.800 60.755 C 278.800 60.267,278.518 60.000,278.000 60.000 C 277.556 60.000,277.200 59.733,277.200 59.400 C 277.200 59.067,276.844 58.800,276.400 58.800 C 275.867 58.800,275.600 58.533,275.600 58.000 C 275.600 57.467,275.333 57.200,274.800 57.200 C 274.267 57.200,274.000 56.933,274.000 56.400 C 274.000 55.752,273.733 55.600,272.600 55.600 C 271.467 55.600,271.200 55.448,271.200 54.800 C 271.200 54.267,270.933 54.000,270.400 54.000 C 269.867 54.000,269.600 53.733,269.600 53.200 C 269.600 52.667,269.333 52.400,268.800 52.400 C 268.267 52.400,268.000 52.133,268.000 51.600 C 268.000 51.103,267.733 50.800,267.296 50.800 C 266.909 50.800,266.368 50.440,266.093 50.000 C 265.774 49.490,265.160 49.200,264.397 49.200 C 263.467 49.200,263.200 49.022,263.200 48.400 C 263.200 47.867,262.933 47.600,262.400 47.600 C 261.867 47.600,261.600 47.333,261.600 46.800 C 261.600 46.267,261.333 46.000,260.800 46.000 C 260.335 46.000,260.000 45.733,260.000 45.363 C 260.000 45.012,259.640 44.631,259.200 44.516 C 258.760 44.401,258.400 44.078,258.400 43.798 C 258.400 43.518,257.770 43.171,257.000 43.026 C 256.162 42.869,255.600 42.530,255.600 42.182 C 255.600 41.862,255.240 41.600,254.800 41.600 C 254.267 41.600,254.000 41.333,254.000 40.800 C 254.000 40.267,253.733 40.000,253.200 40.000 C 252.667 40.000,252.400 39.733,252.400 39.200 C 252.400 38.683,252.133 38.400,251.647 38.400 C 251.230 38.400,250.800 38.043,250.684 37.600 C 250.524 36.987,250.138 36.800,249.037 36.800 C 247.867 36.800,247.600 36.652,247.600 36.000 C 247.600 35.467,247.333 35.200,246.800 35.200 C 246.267 35.200,246.000 34.933,246.000 34.400 C 246.000 33.867,245.733 33.600,245.200 33.600 C 244.667 33.600,244.400 33.333,244.400 32.800 C 244.400 32.267,244.133 32.000,243.600 32.000 C 243.160 32.000,242.800 31.749,242.800 31.443 C 242.800 30.840,241.962 30.400,240.814 30.400 C 240.418 30.400,239.999 30.040,239.884 29.600 C 239.769 29.160,239.409 28.800,239.084 28.800 C 238.759 28.800,238.399 28.440,238.284 28.000 C 238.169 27.560,237.788 27.200,237.437 27.200 C 237.087 27.200,236.800 26.930,236.800 26.600 C 236.800 26.270,236.461 26.000,236.047 26.000 C 235.630 26.000,235.200 25.643,235.084 25.200 C 234.924 24.587,234.538 24.400,233.437 24.400 C 232.267 24.400,232.000 24.252,232.000 23.600 C 232.000 23.067,231.733 22.800,231.200 22.800 C 230.667 22.800,230.400 22.533,230.400 22.000 C 230.400 21.467,230.133 21.200,229.600 21.200 C 229.067 21.200,228.800 20.933,228.800 20.400 C 228.800 19.883,228.533 19.600,228.047 19.600 C 227.630 19.600,227.200 19.243,227.084 18.800 C 226.934 18.226,226.538 18.000,225.684 18.000 C 224.830 18.000,224.434 17.774,224.284 17.200 C 224.169 16.760,223.809 16.400,223.484 16.400 C 223.159 16.400,222.799 16.040,222.684 15.600 C 222.569 15.160,222.188 14.800,221.837 14.800 C 221.487 14.800,221.200 14.526,221.200 14.190 C 221.200 13.855,220.750 13.409,220.200 13.200 C 219.650 12.991,219.200 12.644,219.200 12.428 C 219.200 12.213,218.587 11.921,217.837 11.781 C 216.968 11.618,216.401 11.248,216.274 10.762 C 216.165 10.343,215.788 10.000,215.437 10.000 C 215.087 10.000,214.800 9.730,214.800 9.400 C 214.800 9.067,214.444 8.800,214.000 8.800 C 213.467 8.800,213.200 8.533,213.200 8.000 C 213.200 7.483,212.933 7.200,212.447 7.200 C 212.030 7.200,211.600 6.843,211.484 6.400 C 211.324 5.787,210.938 5.600,209.837 5.600 C 208.667 5.600,208.400 5.452,208.400 4.800 C 208.400 4.360,208.151 4.000,207.847 4.000 C 207.542 4.000,207.199 3.640,207.084 3.200 C 206.969 2.760,206.609 2.400,206.284 2.400 C 205.959 2.400,205.599 2.040,205.484 1.600 C 205.369 1.160,204.988 0.800,204.637 0.800 C 204.287 0.800,204.000 0.620,204.000 0.400 C 204.000 0.178,202.933 0.000,201.600 0.000 L 199.200 0.000 199.200 37.200 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path3" d="M199.200 37.200 L 199.200 74.400 188.443 74.400 C 179.250 74.400,177.652 74.487,177.455 75.000 C 177.278 75.462,176.507 75.601,174.113 75.604 C 170.054 75.610,168.000 75.962,168.000 76.652 C 168.000 77.065,167.285 77.201,165.100 77.205 C 161.724 77.212,160.400 77.492,160.400 78.202 C 160.400 78.550,159.505 78.760,157.556 78.870 C 155.467 78.988,154.580 79.213,154.212 79.716 C 153.850 80.211,153.132 80.400,151.618 80.400 C 149.862 80.400,149.491 80.529,149.316 81.200 C 149.140 81.872,148.770 82.000,147.000 82.000 C 145.230 82.000,144.860 82.128,144.684 82.800 C 144.519 83.432,144.138 83.600,142.870 83.600 C 140.880 83.600,140.000 83.920,140.000 84.643 C 140.000 85.026,139.501 85.200,138.400 85.200 C 137.067 85.200,136.800 85.333,136.800 86.000 C 136.800 86.667,136.533 86.800,135.200 86.800 C 134.133 86.800,133.333 87.067,132.800 87.600 C 132.345 88.055,131.467 88.400,130.763 88.400 C 129.862 88.400,129.468 88.617,129.316 89.200 C 129.152 89.827,128.770 90.000,127.553 90.000 C 126.267 90.000,126.000 90.137,126.000 90.800 C 126.000 91.449,125.733 91.600,124.587 91.600 C 123.728 91.600,123.088 91.825,122.954 92.176 C 122.833 92.492,122.210 92.866,121.571 93.006 C 120.932 93.147,120.300 93.439,120.166 93.655 C 120.032 93.872,119.490 94.214,118.961 94.415 C 118.433 94.616,118.000 95.055,118.000 95.390 C 118.000 95.823,117.584 96.000,116.563 96.000 C 115.485 96.000,115.075 96.191,114.926 96.762 C 114.799 97.248,114.232 97.618,113.363 97.781 C 112.554 97.932,112.000 98.273,112.000 98.618 C 112.000 98.942,111.629 99.200,111.163 99.200 C 110.662 99.200,110.241 99.521,110.116 100.000 C 109.966 100.574,109.570 100.800,108.716 100.800 C 107.862 100.800,107.466 101.026,107.316 101.600 C 107.200 102.043,106.770 102.400,106.353 102.400 C 105.867 102.400,105.600 102.683,105.600 103.200 C 105.600 103.697,105.333 104.000,104.896 104.000 C 104.509 104.000,103.968 104.360,103.693 104.800 C 103.374 105.310,102.760 105.600,101.997 105.600 C 101.067 105.600,100.800 105.778,100.800 106.400 C 100.800 106.933,100.533 107.200,100.000 107.200 C 99.467 107.200,99.200 107.467,99.200 108.000 C 99.200 108.533,98.933 108.800,98.400 108.800 C 97.960 108.800,97.600 109.050,97.600 109.355 C 97.600 109.674,97.002 110.023,96.200 110.174 C 95.428 110.318,94.800 110.676,94.800 110.971 C 94.800 111.266,94.440 111.601,94.000 111.716 C 93.560 111.831,93.200 112.212,93.200 112.563 C 93.200 112.933,92.865 113.200,92.400 113.200 C 91.867 113.200,91.600 113.467,91.600 114.000 C 91.600 114.533,91.333 114.800,90.800 114.800 C 90.267 114.800,90.000 115.067,90.000 115.600 C 90.000 116.133,89.733 116.400,89.200 116.400 C 88.667 116.400,88.400 116.667,88.400 117.200 C 88.400 117.733,88.133 118.000,87.600 118.000 C 87.067 118.000,86.800 118.267,86.800 118.800 C 86.800 119.333,86.533 119.600,86.000 119.600 C 85.467 119.600,85.200 119.867,85.200 120.400 C 85.200 120.933,84.933 121.200,84.400 121.200 C 83.867 121.200,83.600 121.467,83.600 122.000 C 83.600 122.533,83.333 122.800,82.800 122.800 C 82.267 122.800,82.000 123.067,82.000 123.600 C 82.000 124.133,81.733 124.400,81.200 124.400 C 80.760 124.400,80.400 124.658,80.400 124.973 C 80.400 125.288,80.040 125.660,79.600 125.800 C 79.160 125.940,78.800 126.291,78.800 126.580 C 78.800 126.870,78.440 127.201,78.000 127.316 C 77.560 127.431,77.200 127.812,77.200 128.163 C 77.200 128.513,76.930 128.800,76.600 128.800 C 76.267 128.800,76.000 129.156,76.000 129.600 C 76.000 130.133,75.733 130.400,75.200 130.400 C 74.683 130.400,74.400 130.667,74.400 131.153 C 74.400 131.570,74.043 132.000,73.600 132.116 C 73.060 132.257,72.800 132.662,72.800 133.359 C 72.800 133.960,72.465 134.603,72.000 134.893 C 71.560 135.168,71.200 135.709,71.200 136.096 C 71.200 136.533,70.897 136.800,70.400 136.800 C 69.867 136.800,69.600 137.067,69.600 137.600 C 69.600 138.133,69.333 138.400,68.800 138.400 C 68.263 138.400,68.000 138.667,68.000 139.213 C 68.000 139.659,67.741 140.124,67.424 140.246 C 67.108 140.367,66.735 140.984,66.597 141.615 C 66.457 142.249,65.998 142.874,65.572 143.009 C 65.147 143.144,64.800 143.602,64.800 144.027 C 64.800 144.452,64.549 144.800,64.243 144.800 C 63.631 144.800,63.200 145.641,63.200 146.833 C 63.200 147.255,62.926 147.600,62.590 147.600 C 62.255 147.600,61.809 148.050,61.600 148.600 C 61.391 149.150,61.044 149.600,60.828 149.600 C 60.613 149.600,60.318 150.230,60.174 151.000 C 60.023 151.802,59.674 152.400,59.355 152.400 C 59.035 152.400,58.800 152.809,58.800 153.367 C 58.800 154.748,58.402 155.600,57.757 155.600 C 57.451 155.600,57.200 155.917,57.200 156.304 C 57.200 156.691,56.840 157.232,56.400 157.507 C 55.901 157.819,55.600 158.440,55.600 159.157 C 55.600 159.970,55.366 160.368,54.800 160.516 C 54.222 160.667,54.000 161.062,54.000 161.936 C 54.000 162.795,53.768 163.220,53.200 163.400 C 52.620 163.584,52.400 164.005,52.400 164.931 C 52.400 165.774,52.129 166.377,51.600 166.707 C 51.018 167.071,50.800 167.640,50.800 168.800 C 50.800 169.960,50.582 170.529,50.000 170.893 C 49.430 171.249,49.200 171.826,49.200 172.896 C 49.200 174.133,49.058 174.400,48.400 174.400 C 47.733 174.400,47.600 174.667,47.600 176.000 C 47.600 177.096,47.426 177.600,47.047 177.600 C 46.416 177.600,46.013 178.800,46.005 180.700 C 46.002 181.542,45.804 182.000,45.443 182.000 C 44.704 182.000,44.400 182.886,44.400 185.033 C 44.400 186.266,44.234 186.800,43.850 186.800 C 43.283 186.800,42.800 188.460,42.800 190.407 C 42.800 191.022,42.533 191.617,42.200 191.745 C 41.747 191.919,41.600 192.651,41.600 194.741 C 41.600 197.170,41.503 197.532,40.800 197.716 C 40.078 197.905,40.000 198.262,40.000 201.359 C 40.000 204.360,39.899 204.856,39.200 205.293 C 38.478 205.744,38.400 206.226,38.400 210.250 C 38.400 214.370,38.340 214.722,37.600 214.916 C 36.342 215.245,36.342 259.521,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.529 277.200,41.600 277.467,41.600 280.213 C 41.600 282.521,41.740 283.279,42.200 283.455 C 42.607 283.612,42.800 284.250,42.800 285.443 C 42.800 286.667,43.043 287.443,43.600 288.000 C 44.168 288.568,44.400 289.333,44.400 290.637 C 44.400 292.138,44.546 292.513,45.200 292.684 C 45.844 292.852,46.000 293.230,46.000 294.614 C 46.000 296.716,46.309 297.600,47.043 297.600 C 47.426 297.600,47.600 298.099,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.035 300.800,49.201 301.068,49.205 302.100 C 49.213 304.000,49.616 305.200,50.247 305.200 C 50.615 305.200,50.800 305.680,50.800 306.637 C 50.800 307.738,50.987 308.124,51.600 308.284 C 52.227 308.448,52.400 308.830,52.400 310.047 C 52.400 311.333,52.537 311.600,53.200 311.600 C 53.852 311.600,54.000 311.867,54.000 313.037 C 54.000 314.138,54.187 314.524,54.800 314.684 C 55.397 314.840,55.600 315.230,55.600 316.220 C 55.600 317.195,55.812 317.613,56.400 317.800 C 56.840 317.940,57.200 318.402,57.200 318.827 C 57.200 319.252,57.451 319.600,57.757 319.600 C 58.371 319.600,58.800 320.441,58.800 321.645 C 58.800 322.074,59.065 322.527,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 63.052 327.200,63.200 327.467,63.200 328.637 C 63.200 329.738,63.387 330.124,64.000 330.284 C 64.443 330.400,64.800 330.830,64.800 331.247 C 64.800 331.733,65.083 332.000,65.600 332.000 C 66.224 332.000,66.400 332.267,66.400 333.213 C 66.400 333.948,66.648 334.520,67.031 334.667 C 67.377 334.800,67.823 335.335,68.021 335.855 C 68.218 336.375,68.655 336.800,68.990 336.800 C 69.333 336.800,69.600 337.150,69.600 337.600 C 69.600 338.133,69.867 338.400,70.400 338.400 C 70.933 338.400,71.200 338.667,71.200 339.200 C 71.200 339.640,71.560 340.360,72.000 340.800 C 72.440 341.240,72.800 341.870,72.800 342.200 C 72.800 342.533,73.156 342.800,73.600 342.800 C 74.133 342.800,74.400 343.067,74.400 343.600 C 74.400 344.040,74.658 344.400,74.973 344.400 C 75.288 344.400,75.660 344.760,75.800 345.200 C 75.940 345.640,76.312 346.000,76.627 346.000 C 76.942 346.000,77.200 346.360,77.200 346.800 C 77.200 347.333,77.467 347.600,78.000 347.600 C 78.533 347.600,78.800 347.867,78.800 348.400 C 78.800 348.933,79.067 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.317 360.000,91.600 360.267,91.600 360.753 C 91.600 361.170,91.957 361.600,92.400 361.716 C 92.840 361.831,93.200 362.212,93.200 362.563 C 93.200 362.913,93.458 363.200,93.773 363.200 C 94.088 363.200,94.460 363.560,94.600 364.000 C 94.740 364.440,95.202 364.800,95.627 364.800 C 96.052 364.800,96.400 365.062,96.400 365.382 C 96.400 365.730,96.962 366.069,97.800 366.226 C 98.813 366.416,99.200 366.698,99.200 367.245 C 99.200 367.733,99.482 368.000,100.000 368.000 C 100.533 368.000,100.800 368.267,100.800 368.800 C 100.800 369.318,101.067 369.600,101.557 369.600 C 101.974 369.600,102.414 369.860,102.536 370.178 C 102.658 370.496,103.397 370.876,104.179 371.022 C 105.211 371.216,105.600 371.496,105.600 372.045 C 105.600 372.533,105.882 372.800,106.400 372.800 C 106.840 372.800,107.200 373.050,107.200 373.355 C 107.200 373.674,107.798 374.023,108.600 374.174 C 109.438 374.331,110.000 374.670,110.000 375.018 C 110.000 375.338,110.348 375.600,110.773 375.600 C 111.198 375.600,111.660 375.960,111.800 376.400 C 111.989 376.995,112.405 377.200,113.427 377.200 C 114.533 377.200,114.800 377.355,114.800 378.000 C 114.800 378.622,115.067 378.800,115.997 378.800 C 116.760 378.800,117.374 379.090,117.693 379.600 C 117.968 380.040,118.488 380.400,118.850 380.400 C 119.211 380.400,119.601 380.760,119.716 381.200 C 119.876 381.813,120.262 382.000,121.363 382.000 C 122.533 382.000,122.800 382.148,122.800 382.800 C 122.800 383.467,123.067 383.600,124.400 383.600 C 125.733 383.600,126.000 383.733,126.000 384.400 C 126.000 385.045,126.267 385.200,127.373 385.200 C 128.395 385.200,128.811 385.405,129.000 386.000 C 129.187 386.589,129.605 386.800,130.584 386.800 C 131.375 386.800,132.004 387.034,132.136 387.378 C 132.258 387.696,133.042 388.082,133.879 388.236 C 134.716 388.390,135.829 388.850,136.354 389.258 C 136.879 389.666,137.914 390.000,138.654 390.000 C 139.528 390.000,140.000 390.192,140.000 390.549 C 140.000 390.918,140.675 391.163,142.054 391.296 C 143.383 391.423,144.238 391.724,144.474 392.146 C 144.743 392.627,145.419 392.800,147.020 392.800 C 148.933 392.800,149.200 392.898,149.200 393.600 C 149.200 394.311,149.467 394.400,151.600 394.400 C 153.733 394.400,154.000 394.489,154.000 395.200 C 154.000 395.928,154.267 396.000,156.973 396.000 C 159.595 396.000,159.976 396.095,160.200 396.800 C 160.423 397.504,160.805 397.600,163.380 397.600 C 165.970 397.600,166.331 397.692,166.516 398.400 C 166.710 399.142,167.062 399.200,171.363 399.200 C 174.188 399.200,176.000 399.356,176.000 399.600 C 176.000 399.862,184.267 400.000,200.000 400.000 C 215.733 400.000,224.000 399.862,224.000 399.600 C 224.000 399.356,225.812 399.200,228.637 399.200 C 232.938 399.200,233.290 399.142,233.484 398.400 C 233.671 397.685,234.030 397.600,236.843 397.600 C 239.560 397.600,240.062 397.490,240.493 396.800 C 240.906 396.138,241.426 396.000,243.496 396.000 C 245.733 396.000,246.000 395.915,246.000 395.200 C 246.000 394.489,246.267 394.400,248.400 394.400 C 250.267 394.400,250.978 394.222,251.600 393.600 C 252.107 393.093,252.933 392.800,253.856 392.800 C 254.729 392.800,255.499 392.544,255.780 392.159 C 256.043 391.800,257.073 391.426,258.124 391.307 C 259.239 391.182,260.000 390.894,260.000 390.599 C 260.000 390.293,260.790 390.026,262.054 389.904 C 263.383 389.777,264.238 389.476,264.474 389.054 C 264.675 388.694,265.266 388.400,265.787 388.400 C 267.149 388.400,268.000 387.999,268.000 387.357 C 268.000 386.984,268.475 386.800,269.437 386.800 C 270.538 386.800,270.924 386.613,271.084 386.000 C 271.241 385.399,271.630 385.200,272.647 385.200 C 273.733 385.200,274.000 385.042,274.000 384.400 C 274.000 383.733,274.267 383.600,275.600 383.600 C 276.933 383.600,277.200 383.467,277.200 382.800 C 277.200 382.133,277.467 382.000,278.800 382.000 C 280.133 382.000,280.400 381.867,280.400 381.200 C 280.400 380.578,280.667 380.400,281.597 380.400 C 282.360 380.400,282.974 380.110,283.293 379.600 C 283.568 379.160,284.109 378.800,284.496 378.800 C 284.933 378.800,285.200 378.497,285.200 378.000 C 285.200 377.348,285.467 377.200,286.637 377.200 C 287.738 377.200,288.124 377.013,288.284 376.400 C 288.400 375.955,288.830 375.600,289.251 375.600 C 289.667 375.600,290.316 375.240,290.693 374.800 C 291.070 374.360,291.698 374.000,292.089 374.000 C 292.480 374.000,292.800 373.730,292.800 373.400 C 292.800 373.067,293.156 372.800,293.600 372.800 C 294.133 372.800,294.400 372.533,294.400 372.000 C 294.400 371.421,294.667 371.200,295.367 371.200 C 296.748 371.200,297.600 370.802,297.600 370.157 C 297.600 369.851,297.960 369.600,298.400 369.600 C 298.933 369.600,299.200 369.333,299.200 368.800 C 299.200 368.267,299.467 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.576,301.067 366.400,302.013 366.400 C 302.748 366.400,303.320 366.152,303.467 365.769 C 303.600 365.423,304.135 364.977,304.655 364.779 C 305.175 364.582,305.600 364.166,305.600 363.857 C 305.600 363.547,305.960 363.199,306.400 363.084 C 306.840 362.969,307.200 362.588,307.200 362.237 C 307.200 361.887,307.470 361.600,307.800 361.600 C 308.133 361.600,308.400 361.244,308.400 360.800 C 308.400 360.267,308.667 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.232,311.600 358.027 C 311.600 357.822,311.916 357.554,312.302 357.431 C 313.725 356.979,321.200 349.174,321.200 348.139 C 321.200 347.843,321.560 347.600,322.000 347.600 C 322.533 347.600,322.800 347.333,322.800 346.800 C 322.800 346.360,323.058 346.000,323.373 346.000 C 323.688 346.000,324.060 345.640,324.200 345.200 C 324.340 344.760,324.712 344.400,325.027 344.400 C 325.342 344.400,325.600 344.040,325.600 343.600 C 325.600 343.067,325.867 342.800,326.400 342.800 C 326.933 342.800,327.200 342.533,327.200 342.000 C 327.200 341.467,327.467 341.200,328.000 341.200 C 328.648 341.200,328.800 340.933,328.800 339.800 C 328.800 338.667,328.952 338.400,329.600 338.400 C 330.133 338.400,330.400 338.133,330.400 337.600 C 330.400 337.067,330.667 336.800,331.200 336.800 C 331.717 336.800,332.000 336.533,332.000 336.047 C 332.000 335.630,332.357 335.200,332.800 335.084 C 333.413 334.924,333.600 334.538,333.600 333.437 C 333.600 332.267,333.748 332.000,334.400 332.000 C 334.917 332.000,335.200 331.733,335.200 331.247 C 335.200 330.830,335.557 330.400,336.000 330.284 C 336.540 330.143,336.800 329.738,336.800 329.041 C 336.800 328.440,337.135 327.797,337.600 327.507 C 338.040 327.232,338.400 326.691,338.400 326.304 C 338.400 325.917,338.662 325.600,338.982 325.600 C 339.330 325.600,339.669 325.038,339.826 324.200 C 339.977 323.398,340.326 322.800,340.645 322.800 C 340.950 322.800,341.200 322.446,341.200 322.014 C 341.200 321.582,341.560 321.035,342.000 320.800 C 342.513 320.526,342.800 319.962,342.800 319.233 C 342.800 318.430,343.036 318.032,343.600 317.884 C 344.213 317.724,344.400 317.338,344.400 316.237 C 344.400 315.067,344.548 314.800,345.200 314.800 C 345.867 314.800,346.000 314.533,346.000 313.200 C 346.000 311.867,346.133 311.600,346.800 311.600 C 347.467 311.600,347.600 311.333,347.600 310.000 C 347.600 308.667,347.733 308.400,348.400 308.400 C 349.052 308.400,349.200 308.133,349.200 306.963 C 349.200 305.862,349.387 305.476,350.000 305.316 C 350.601 305.159,350.800 304.770,350.800 303.753 C 350.800 302.933,351.115 302.085,351.600 301.600 C 352.125 301.075,352.400 300.267,352.400 299.247 C 352.400 298.030,352.573 297.648,353.200 297.484 C 353.853 297.313,354.000 296.938,354.000 295.441 C 354.000 294.040,354.189 293.489,354.800 293.107 C 355.409 292.727,355.600 292.174,355.600 290.793 C 355.600 289.473,355.818 288.791,356.400 288.293 C 357.002 287.777,357.200 287.113,357.200 285.604 C 357.200 284.089,357.347 283.600,357.800 283.600 C 358.267 283.600,358.400 283.067,358.400 281.200 C 358.400 279.333,358.578 278.622,359.200 278.000 C 359.856 277.344,360.000 276.667,360.000 274.247 C 360.000 271.630,360.091 271.269,360.800 271.084 C 361.542 270.890,361.600 270.538,361.600 266.237 C 361.600 261.867,361.646 261.600,362.400 261.600 C 363.175 261.600,363.200 261.333,363.200 253.020 C 363.200 245.264,363.267 244.402,363.900 244.048 C 364.462 243.733,364.628 242.982,364.741 240.228 L 364.882 236.800 338.241 236.800 L 311.600 236.800 311.600 239.469 C 311.600 241.449,311.419 242.336,310.900 242.910 C 310.316 243.554,310.177 244.652,310.061 249.526 C 309.962 253.669,309.771 255.490,309.406 255.785 C 309.096 256.035,308.807 257.537,308.679 259.565 C 308.522 262.060,308.303 263.023,307.833 263.285 C 307.344 263.559,307.200 264.317,307.200 266.620 C 307.200 269.333,307.128 269.600,306.400 269.600 C 305.689 269.600,305.600 269.867,305.600 272.000 C 305.600 274.133,305.511 274.400,304.800 274.400 C 304.137 274.400,304.000 274.667,304.000 275.953 C 304.000 277.170,303.827 277.552,303.200 277.716 C 302.532 277.891,302.400 278.262,302.400 279.963 C 302.400 281.733,302.295 282.000,301.600 282.000 C 300.933 282.000,300.800 282.267,300.800 283.600 C 300.800 284.933,300.667 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.733 288.400,297.600 288.667,297.600 290.000 C 297.600 291.333,297.467 291.600,296.800 291.600 C 296.282 291.600,296.000 291.867,296.000 292.357 C 296.000 292.774,295.747 293.212,295.438 293.330 C 295.128 293.449,294.754 294.098,294.606 294.773 C 294.458 295.448,294.097 296.000,293.803 296.000 C 293.493 296.000,293.157 296.669,293.000 297.600 C 292.834 298.584,292.512 299.200,292.165 299.200 C 291.854 299.200,291.600 299.560,291.600 300.000 C 291.600 300.533,291.333 300.800,290.800 300.800 C 290.271 300.800,290.000 301.067,290.000 301.586 C 290.000 302.018,289.640 302.565,289.200 302.800 C 288.676 303.080,288.400 303.638,288.400 304.414 C 288.400 305.333,288.220 305.600,287.600 305.600 C 287.067 305.600,286.800 305.867,286.800 306.400 C 286.800 306.933,286.533 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.867 308.800,283.600 309.067,283.600 309.600 C 283.600 310.052,283.333 310.400,282.987 310.400 C 282.651 310.400,282.263 310.692,282.126 311.050 C 281.989 311.407,281.186 312.442,280.343 313.350 C 279.500 314.257,278.808 315.315,278.805 315.700 C 278.802 316.132,278.493 316.400,278.000 316.400 C 277.544 316.400,277.200 316.667,277.200 317.021 C 277.200 317.362,276.660 317.830,276.000 318.060 C 275.340 318.290,274.800 318.645,274.800 318.849 C 274.800 319.053,274.350 319.391,273.800 319.600 C 273.250 319.809,272.800 320.255,272.800 320.590 C 272.800 320.933,272.450 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.133,269.333 324.400,268.800 324.400 C 268.360 324.400,268.000 324.656,268.000 324.968 C 268.000 325.281,267.448 325.658,266.773 325.806 C 266.098 325.954,265.455 326.312,265.344 326.602 C 265.233 326.891,264.705 327.237,264.171 327.372 C 263.637 327.506,263.200 327.861,263.200 328.161 C 263.200 328.461,262.840 328.801,262.400 328.916 C 261.960 329.031,261.600 329.412,261.600 329.763 C 261.600 330.224,261.214 330.400,260.200 330.400 C 259.094 330.400,258.800 330.559,258.800 331.155 C 258.800 331.704,258.411 331.984,257.379 332.178 C 256.597 332.324,255.858 332.704,255.736 333.022 C 255.614 333.340,255.174 333.600,254.757 333.600 C 254.267 333.600,254.000 333.882,254.000 334.400 C 254.000 335.067,253.733 335.200,252.400 335.200 C 251.067 335.200,250.800 335.333,250.800 336.000 C 250.800 336.667,250.533 336.800,249.200 336.800 C 247.867 336.800,247.600 336.933,247.600 337.600 C 247.600 338.252,247.333 338.400,246.163 338.400 C 245.062 338.400,244.676 338.587,244.516 339.200 C 244.342 339.865,243.970 340.000,242.316 340.000 C 240.662 340.000,240.290 340.135,240.116 340.800 C 239.952 341.427,239.570 341.600,238.353 341.600 C 237.239 341.600,236.800 341.770,236.800 342.200 C 236.800 342.643,236.337 342.800,235.033 342.800 C 232.886 342.800,232.000 343.104,232.000 343.843 C 232.000 344.256,231.389 344.400,229.633 344.400 C 226.940 344.400,226.000 344.659,226.000 345.403 C 226.000 345.778,225.000 345.959,222.368 346.060 C 219.478 346.171,218.630 346.343,218.223 346.900 C 217.776 347.512,216.970 347.600,211.818 347.600 C 206.262 347.600,205.913 347.646,205.716 348.400 C 205.519 349.151,205.170 349.200,200.000 349.200 C 194.830 349.200,194.481 349.151,194.284 348.400 C 194.087 347.646,193.738 347.600,188.237 347.600 C 182.933 347.600,182.327 347.527,181.600 346.800 C 180.925 346.125,180.267 346.000,177.400 346.000 C 174.761 346.000,174.000 345.875,174.000 345.443 C 174.000 344.679,173.105 344.400,170.656 344.400 C 169.073 344.400,168.415 344.209,167.893 343.600 C 167.423 343.051,166.713 342.800,165.632 342.800 C 164.766 342.800,163.787 342.530,163.457 342.200 C 163.127 341.870,162.214 341.600,161.429 341.600 C 160.267 341.600,160.000 341.451,160.000 340.800 C 160.000 340.119,159.733 340.000,158.203 340.000 C 156.840 340.000,156.286 339.807,155.907 339.200 C 155.551 338.630,154.974 338.400,153.904 338.400 C 152.667 338.400,152.400 338.258,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.333,148.933 335.200,147.600 335.200 C 146.267 335.200,146.000 335.067,146.000 334.400 C 146.000 333.867,145.733 333.600,145.200 333.600 C 144.760 333.600,144.400 333.349,144.400 333.043 C 144.400 332.398,143.548 332.000,142.167 332.000 C 141.467 332.000,141.200 331.779,141.200 331.200 C 141.200 330.667,140.933 330.400,140.400 330.400 C 139.960 330.400,139.240 330.040,138.800 329.600 C 138.360 329.160,137.730 328.800,137.400 328.800 C 137.070 328.800,136.800 328.526,136.800 328.190 C 136.800 327.855,136.350 327.409,135.800 327.200 C 135.250 326.991,134.800 326.655,134.800 326.454 C 134.800 326.253,134.170 325.971,133.400 325.826 C 132.562 325.669,132.000 325.330,132.000 324.982 C 132.000 324.662,131.640 324.400,131.200 324.400 C 130.667 324.400,130.400 324.133,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.935 319.600,125.600 319.333,125.600 318.963 C 125.600 318.612,125.240 318.231,124.800 318.116 C 124.360 318.001,124.000 317.658,124.000 317.353 C 124.000 317.049,123.852 316.800,123.672 316.800 C 123.141 316.800,120.800 314.570,120.800 314.064 C 120.800 313.809,120.542 313.600,120.227 313.600 C 119.912 313.600,119.540 313.240,119.400 312.800 C 119.260 312.360,118.888 312.000,118.573 312.000 C 118.258 312.000,118.000 311.661,118.000 311.247 C 118.000 310.830,117.643 310.400,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.467 307.200,113.200 306.933,113.200 306.400 C 113.200 305.867,112.933 305.600,112.400 305.600 C 111.748 305.600,111.600 305.333,111.600 304.163 C 111.600 303.062,111.413 302.676,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.576 300.800,108.400 300.533,108.400 299.587 C 108.400 298.913,108.150 298.279,107.836 298.159 C 107.526 298.039,107.163 297.505,107.028 296.971 C 106.894 296.437,106.538 296.000,106.237 296.000 C 105.927 296.000,105.575 295.391,105.426 294.600 C 105.269 293.762,104.930 293.200,104.582 293.200 C 104.262 293.200,104.000 292.874,104.000 292.475 C 104.000 292.077,103.640 291.364,103.200 290.892 C 102.760 290.420,102.400 289.666,102.400 289.217 C 102.400 288.667,102.139 288.400,101.600 288.400 C 100.933 288.400,100.800 288.133,100.800 286.800 C 100.800 285.467,100.667 285.200,100.000 285.200 C 99.333 285.200,99.200 284.933,99.200 283.600 C 99.200 282.533,98.933 281.733,98.400 281.200 C 97.911 280.711,97.600 279.867,97.600 279.027 C 97.600 278.005,97.395 277.589,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.523 272.739,94.400 272.370,94.400 270.516 C 94.400 268.662,94.277 268.293,93.600 268.116 C 92.916 267.937,92.800 267.570,92.800 265.582 C 92.800 263.998,92.599 263.056,92.169 262.626 C 91.756 262.213,91.457 260.928,91.304 258.904 C 91.172 257.152,90.839 255.581,90.535 255.278 C 89.583 254.326,89.645 221.098,90.600 220.143 C 90.865 219.878,91.181 218.212,91.302 216.441 C 91.452 214.262,91.730 213.013,92.161 212.581 C 92.614 212.129,92.800 211.193,92.800 209.371 C 92.800 207.067,92.883 206.800,93.600 206.800 C 94.302 206.800,94.400 206.533,94.400 204.627 C 94.400 202.805,94.529 202.413,95.200 202.200 C 95.871 201.987,96.000 201.595,96.000 199.773 C 96.000 197.867,96.098 197.600,96.800 197.600 C 97.463 197.600,97.600 197.333,97.600 196.047 C 97.600 194.830,97.773 194.448,98.400 194.284 C 99.052 194.113,99.200 193.738,99.200 192.252 C 99.200 190.838,99.380 190.332,100.000 190.000 C 100.440 189.765,100.800 189.246,100.800 188.848 C 100.800 188.450,101.160 187.798,101.600 187.400 C 102.040 187.002,102.400 186.254,102.400 185.738 C 102.400 185.184,102.638 184.800,102.982 184.800 C 103.330 184.800,103.669 184.238,103.826 183.400 C 103.971 182.630,104.320 182.000,104.602 182.000 C 105.199 182.000,105.600 181.121,105.600 179.814 C 105.600 179.230,105.892 178.817,106.400 178.684 C 106.840 178.569,107.200 178.188,107.200 177.837 C 107.200 177.487,107.470 177.200,107.800 177.200 C 108.217 177.200,108.400 176.781,108.400 175.827 C 108.400 174.805,108.605 174.389,109.200 174.200 C 109.640 174.060,110.000 173.700,110.000 173.400 C 110.000 173.100,110.360 172.740,110.800 172.600 C 111.240 172.460,111.600 172.088,111.600 171.773 C 111.600 171.458,111.960 170.840,112.400 170.400 C 112.840 169.960,113.200 169.240,113.200 168.800 C 113.200 168.267,113.467 168.000,114.000 168.000 C 114.533 168.000,114.800 167.733,114.800 167.200 C 114.800 166.667,115.067 166.400,115.600 166.400 C 116.133 166.400,116.400 166.133,116.400 165.600 C 116.400 165.067,116.667 164.800,117.200 164.800 C 117.717 164.800,118.000 164.533,118.000 164.047 C 118.000 163.630,118.357 163.200,118.800 163.084 C 119.240 162.969,119.600 162.588,119.600 162.237 C 119.600 161.887,119.858 161.600,120.173 161.600 C 120.488 161.600,120.860 161.240,121.000 160.800 C 121.140 160.360,121.512 160.000,121.827 160.000 C 122.142 160.000,122.400 159.640,122.400 159.200 C 122.400 158.667,122.667 158.400,123.200 158.400 C 123.665 158.400,124.000 158.133,124.000 157.763 C 124.000 157.412,124.360 157.031,124.800 156.916 C 125.240 156.801,125.600 156.479,125.600 156.200 C 125.600 155.921,125.960 155.599,126.400 155.484 C 126.840 155.369,127.200 154.988,127.200 154.637 C 127.200 154.267,127.535 154.000,128.000 154.000 C 128.533 154.000,128.800 153.733,128.800 153.200 C 128.800 152.667,129.067 152.400,129.600 152.400 C 130.133 152.400,130.400 152.133,130.400 151.600 C 130.400 151.067,130.667 150.800,131.200 150.800 C 131.640 150.800,132.360 150.440,132.800 150.000 C 133.240 149.560,133.887 149.200,134.237 149.200 C 134.588 149.200,134.969 148.840,135.084 148.400 C 135.200 147.957,135.630 147.600,136.047 147.600 C 136.533 147.600,136.800 147.317,136.800 146.800 C 136.800 146.172,137.067 146.000,138.037 146.000 C 138.938 146.000,139.332 145.783,139.484 145.200 C 139.600 144.757,140.030 144.400,140.447 144.400 C 140.933 144.400,141.200 144.117,141.200 143.600 C 141.200 142.933,141.467 142.800,142.800 142.800 C 144.133 142.800,144.400 142.667,144.400 142.000 C 144.400 141.352,144.667 141.200,145.800 141.200 C 146.570 141.200,147.200 141.022,147.200 140.805 C 147.200 140.588,147.808 140.157,148.551 139.846 C 149.294 139.536,150.025 139.083,150.175 138.841 C 150.325 138.598,150.790 138.400,151.210 138.400 C 151.629 138.400,152.165 138.040,152.400 137.600 C 152.699 137.042,153.238 136.800,154.181 136.800 C 155.930 136.800,156.800 136.454,156.800 135.757 C 156.800 135.374,157.299 135.200,158.400 135.200 C 159.733 135.200,160.000 135.067,160.000 134.400 C 160.000 133.695,160.267 133.600,162.237 133.600 C 164.138 133.600,164.506 133.480,164.684 132.800 C 164.860 132.127,165.230 132.000,167.020 132.000 C 168.795 132.000,169.188 131.868,169.400 131.200 C 169.619 130.509,170.005 130.400,172.224 130.400 C 174.360 130.400,174.877 130.265,175.293 129.600 C 175.723 128.912,176.226 128.800,178.896 128.800 C 181.467 128.800,182.137 128.663,182.800 128.000 C 183.545 127.255,184.133 127.200,191.400 127.200 L 199.200 127.200 199.200 164.000 L 199.200 200.800 201.373 200.800 C 203.153 200.800,203.589 200.663,203.786 200.043 C 203.918 199.627,204.381 199.194,204.813 199.081 C 205.246 198.967,205.600 198.609,205.600 198.284 C 205.600 197.959,205.960 197.599,206.400 197.484 C 206.840 197.369,207.200 196.988,207.200 196.637 C 207.200 196.287,207.430 196.000,207.712 196.000 C 207.993 196.000,208.483 195.640,208.800 195.200 C 209.139 194.730,209.835 194.400,210.488 194.400 C 211.333 194.400,211.600 194.208,211.600 193.600 C 211.600 193.067,211.867 192.800,212.400 192.800 C 212.933 192.800,213.200 192.533,213.200 192.000 C 213.200 191.467,213.467 191.200,214.000 191.200 C 214.444 191.200,214.800 190.933,214.800 190.600 C 214.800 190.270,215.064 190.000,215.386 190.000 C 215.708 190.000,216.165 189.640,216.400 189.200 C 216.635 188.760,217.182 188.400,217.614 188.400 C 218.046 188.400,218.729 188.071,219.131 187.669 C 219.532 187.268,220.162 186.823,220.531 186.682 C 220.899 186.541,221.200 186.170,221.200 185.859 C 221.200 185.548,221.560 185.199,222.000 185.084 C 222.440 184.969,222.800 184.588,222.800 184.237 C 222.800 183.887,223.064 183.600,223.386 183.600 C 223.708 183.600,224.165 183.240,224.400 182.800 C 224.680 182.276,225.238 182.000,226.014 182.000 C 226.933 182.000,227.200 181.820,227.200 181.200 C 227.200 180.667,227.467 180.400,228.000 180.400 C 228.533 180.400,228.800 180.133,228.800 179.600 C 228.800 179.067,229.067 178.800,229.600 178.800 C 230.133 178.800,230.400 178.533,230.400 178.000 C 230.400 177.467,230.667 177.200,231.200 177.200 C 231.640 177.200,232.360 176.840,232.800 176.400 C 233.240 175.960,233.887 175.600,234.237 175.600 C 234.588 175.600,234.969 175.240,235.084 174.800 C 235.200 174.357,235.630 174.000,236.047 174.000 C 236.461 174.000,236.800 173.751,236.800 173.447 C 236.800 173.142,237.160 172.799,237.600 172.684 C 238.040 172.569,238.400 172.188,238.400 171.837 C 238.400 171.487,238.636 171.200,238.925 171.200 C 239.213 171.200,239.836 170.840,240.308 170.400 C 240.780 169.960,241.461 169.600,241.821 169.600 C 242.181 169.600,242.569 169.240,242.684 168.800 C 242.800 168.357,243.230 168.000,243.647 168.000 C 244.133 168.000,244.400 167.717,244.400 167.200 C 244.400 166.667,244.667 166.400,245.200 166.400 C 245.733 166.400,246.000 166.133,246.000 165.600 C 246.000 165.067,246.267 164.800,246.800 164.800 C 247.240 164.800,247.960 164.440,248.400 164.000 C 248.840 163.560,249.487 163.200,249.837 163.200 C 250.188 163.200,250.569 162.840,250.684 162.400 C 250.800 161.957,251.230 161.600,251.647 161.600 C 252.133 161.600,252.400 161.317,252.400 160.800 C 252.400 160.267,252.667 160.000,253.200 160.000 C 253.733 160.000,254.000 159.733,254.000 159.200 C 254.000 158.665,254.267 158.400,254.804 158.400 C 255.246 158.400,255.916 158.040,256.293 157.600 C 256.670 157.160,257.298 156.800,257.689 156.800 C 258.080 156.800,258.400 156.551,258.400 156.247 C 258.400 155.942,258.760 155.599,259.200 155.484 C 259.640 155.369,260.000 154.988,260.000 154.637 C 260.000 154.267,260.335 154.000,260.800 154.000 C 261.333 154.000,261.600 153.733,261.600 153.200 C 261.600 152.703,261.867 152.400,262.304 152.400 C 262.691 152.400,263.232 152.040,263.507 151.600 C 263.797 151.135,264.440 150.800,265.041 150.800 C 265.738 150.800,266.143 150.540,266.284 150.000 C 266.400 149.557,266.830 149.200,267.247 149.200 C 267.733 149.200,268.000 148.917,268.000 148.400 C 268.000 147.867,268.267 147.600,268.800 147.600 C 269.333 147.600,269.600 147.333,269.600 146.800 C 269.600 146.303,269.867 146.000,270.304 146.000 C 270.691 146.000,271.232 145.640,271.507 145.200 C 271.790 144.748,272.440 144.400,273.003 144.400 C 273.733 144.400,274.000 144.186,274.000 143.600 C 274.000 143.067,274.267 142.800,274.800 142.800 C 275.333 142.800,275.600 142.533,275.600 142.000 C 275.600 141.467,275.867 141.200,276.400 141.200 C 276.844 141.200,277.200 140.933,277.200 140.600 C 277.200 140.270,277.517 140.000,277.904 140.000 C 278.291 140.000,278.822 139.656,279.085 139.236 C 279.347 138.816,280.110 138.351,280.781 138.204 C 281.451 138.057,282.000 137.681,282.000 137.368 C 282.000 137.056,282.287 136.800,282.637 136.800 C 282.988 136.800,283.369 136.440,283.484 136.000 C 283.600 135.557,284.030 135.200,284.447 135.200 C 284.933 135.200,285.200 134.917,285.200 134.400 C 285.200 133.903,285.467 133.600,285.904 133.600 C 286.291 133.600,286.832 133.240,287.107 132.800 C 287.390 132.348,288.040 132.000,288.603 132.000 C 289.333 132.000,289.600 131.786,289.600 131.200 C 289.600 130.667,289.867 130.400,290.400 130.400 C 290.933 130.400,291.200 130.133,291.200 129.600 C 291.200 129.067,291.467 128.800,292.000 128.800 C 292.533 128.800,292.800 128.533,292.800 128.000 C 292.800 127.500,293.067 127.200,293.512 127.200 C 293.903 127.200,294.483 126.840,294.800 126.400 C 295.139 125.930,295.835 125.600,296.488 125.600 C 297.333 125.600,297.600 125.408,297.600 124.800 C 297.600 124.267,297.867 124.000,298.400 124.000 C 298.844 124.000,299.200 123.733,299.200 123.400 C 299.200 123.070,299.487 122.800,299.837 122.800 C 300.188 122.800,300.569 122.440,300.684 122.000 C 300.799 121.560,301.204 121.200,301.585 121.200 C 301.965 121.200,302.602 120.840,303.000 120.400 C 303.398 119.960,303.960 119.600,304.248 119.600 C 304.536 119.600,304.965 119.240,305.200 118.800 C 305.435 118.360,305.880 118.000,306.187 118.000 C 306.495 118.000,306.860 117.640,307.000 117.200 C 307.140 116.760,307.512 116.400,307.827 116.400 C 308.142 116.400,308.400 116.040,308.400 115.600 C 308.400 115.067,308.667 114.800,309.200 114.800 C 309.640 114.800,310.360 114.440,310.800 114.000 C 311.240 113.560,311.887 113.200,312.237 113.200 C 312.588 113.200,312.969 112.840,313.084 112.400 C 313.200 111.957,313.630 111.600,314.047 111.600 C 314.533 111.600,314.800 111.317,314.800 110.800 C 314.800 110.267,315.067 110.000,315.600 110.000 C 316.133 110.000,316.400 109.733,316.400 109.200 C 316.400 108.682,316.667 108.400,317.157 108.400 C 317.574 108.400,318.012 108.147,318.130 107.838 C 318.249 107.528,318.883 107.157,319.540 107.013 C 320.196 106.869,320.833 106.492,320.954 106.176 C 321.076 105.859,321.438 105.600,321.760 105.600 C 322.083 105.600,322.460 105.240,322.600 104.800 C 322.740 104.360,323.100 104.000,323.400 104.000 C 323.700 104.000,324.048 103.680,324.172 103.288 C 324.296 102.897,324.938 102.372,325.599 102.123 C 326.905 101.630,327.277 100.158,326.200 99.745 C 325.870 99.618,325.600 99.105,325.600 98.604 C 325.600 98.030,325.304 97.616,324.800 97.484 C 324.360 97.369,324.000 96.988,324.000 96.637 C 324.000 96.287,323.773 96.000,323.496 96.000 C 323.219 96.000,322.768 95.640,322.493 95.200 C 322.218 94.760,321.725 94.400,321.397 94.400 C 321.068 94.400,320.800 94.150,320.800 93.845 C 320.800 93.526,320.202 93.177,319.400 93.026 C 318.562 92.869,318.000 92.530,318.000 92.182 C 318.000 91.862,317.640 91.600,317.200 91.600 C 316.667 91.600,316.400 91.333,316.400 90.800 C 316.400 90.267,316.133 90.000,315.600 90.000 C 315.067 90.000,314.800 89.733,314.800 89.200 C 314.800 88.683,314.533 88.400,314.047 88.400 C 313.630 88.400,313.200 88.043,313.084 87.600 C 312.924 86.987,312.538 86.800,311.437 86.800 C 310.267 86.800,310.000 86.652,310.000 86.000 C 310.000 85.467,309.733 85.200,309.200 85.200 C 308.683 85.200,308.400 84.933,308.400 84.447 C 308.400 84.030,308.043 83.600,307.600 83.484 C 307.160 83.369,306.800 82.988,306.800 82.637 C 306.800 82.267,306.465 82.000,306.000 82.000 C 305.560 82.000,305.200 81.749,305.200 81.443 C 305.200 80.831,304.359 80.400,303.167 80.400 C 302.667 80.400,302.400 80.122,302.400 79.600 C 302.400 79.083,302.133 78.800,301.647 78.800 C 301.230 78.800,300.800 78.443,300.684 78.000 C 300.569 77.560,300.188 77.200,299.837 77.200 C 299.487 77.200,299.200 76.930,299.200 76.600 C 299.200 76.270,298.861 76.000,298.447 76.000 C 298.030 76.000,297.600 75.643,297.484 75.200 C 297.324 74.587,296.938 74.400,295.837 74.400 C 294.667 74.400,294.400 74.252,294.400 73.600 C 294.400 73.067,294.133 72.800,293.600 72.800 C 293.067 72.800,292.800 72.533,292.800 72.000 C 292.800 71.467,292.533 71.200,292.000 71.200 C 291.467 71.200,291.200 70.933,291.200 70.400 C 291.200 69.883,290.933 69.600,290.447 69.600 C 290.030 69.600,289.600 69.243,289.484 68.800 C 289.332 68.217,288.938 68.000,288.037 68.000 C 287.067 68.000,286.800 67.828,286.800 67.200 C 286.800 66.667,286.533 66.400,286.000 66.400 C 285.467 66.400,285.200 66.133,285.200 65.600 C 285.200 65.083,284.933 64.800,284.447 64.800 C 284.030 64.800,283.600 64.443,283.484 64.000 C 283.369 63.560,283.007 63.200,282.680 63.200 C 282.353 63.200,281.986 62.940,281.864 62.622 C 281.742 62.304,281.003 61.924,280.221 61.778 C 279.189 61.584,278.800 61.304,278.800 60.755 C 278.800 60.267,278.518 60.000,278.000 60.000 C 277.556 60.000,277.200 59.733,277.200 59.400 C 277.200 59.067,276.844 58.800,276.400 58.800 C 275.867 58.800,275.600 58.533,275.600 58.000 C 275.600 57.467,275.333 57.200,274.800 57.200 C 274.267 57.200,274.000 56.933,274.000 56.400 C 274.000 55.752,273.733 55.600,272.600 55.600 C 271.467 55.600,271.200 55.448,271.200 54.800 C 271.200 54.267,270.933 54.000,270.400 54.000 C 269.867 54.000,269.600 53.733,269.600 53.200 C 269.600 52.667,269.333 52.400,268.800 52.400 C 268.267 52.400,268.000 52.133,268.000 51.600 C 268.000 51.103,267.733 50.800,267.296 50.800 C 266.909 50.800,266.368 50.440,266.093 50.000 C 265.774 49.490,265.160 49.200,264.397 49.200 C 263.467 49.200,263.200 49.022,263.200 48.400 C 263.200 47.867,262.933 47.600,262.400 47.600 C 261.867 47.600,261.600 47.333,261.600 46.800 C 261.600 46.267,261.333 46.000,260.800 46.000 C 260.335 46.000,260.000 45.733,260.000 45.363 C 260.000 45.012,259.640 44.631,259.200 44.516 C 258.760 44.401,258.400 44.078,258.400 43.798 C 258.400 43.518,257.770 43.171,257.000 43.026 C 256.162 42.869,255.600 42.530,255.600 42.182 C 255.600 41.862,255.240 41.600,254.800 41.600 C 254.267 41.600,254.000 41.333,254.000 40.800 C 254.000 40.267,253.733 40.000,253.200 40.000 C 252.667 40.000,252.400 39.733,252.400 39.200 C 252.400 38.683,252.133 38.400,251.647 38.400 C 251.230 38.400,250.800 38.043,250.684 37.600 C 250.524 36.987,250.138 36.800,249.037 36.800 C 247.867 36.800,247.600 36.652,247.600 36.000 C 247.600 35.467,247.333 35.200,246.800 35.200 C 246.267 35.200,246.000 34.933,246.000 34.400 C 246.000 33.867,245.733 33.600,245.200 33.600 C 244.667 33.600,244.400 33.333,244.400 32.800 C 244.400 32.267,244.133 32.000,243.600 32.000 C 243.160 32.000,242.800 31.749,242.800 31.443 C 242.800 30.840,241.962 30.400,240.814 30.400 C 240.418 30.400,239.999 30.040,239.884 29.600 C 239.769 29.160,239.409 28.800,239.084 28.800 C 238.759 28.800,238.399 28.440,238.284 28.000 C 238.169 27.560,237.788 27.200,237.437 27.200 C 237.087 27.200,236.800 26.930,236.800 26.600 C 236.800 26.270,236.461 26.000,236.047 26.000 C 235.630 26.000,235.200 25.643,235.084 25.200 C 234.924 24.587,234.538 24.400,233.437 24.400 C 232.267 24.400,232.000 24.252,232.000 23.600 C 232.000 23.067,231.733 22.800,231.200 22.800 C 230.667 22.800,230.400 22.533,230.400 22.000 C 230.400 21.467,230.133 21.200,229.600 21.200 C 229.067 21.200,228.800 20.933,228.800 20.400 C 228.800 19.883,228.533 19.600,228.047 19.600 C 227.630 19.600,227.200 19.243,227.084 18.800 C 226.934 18.226,226.538 18.000,225.684 18.000 C 224.830 18.000,224.434 17.774,224.284 17.200 C 224.169 16.760,223.809 16.400,223.484 16.400 C 223.159 16.400,222.799 16.040,222.684 15.600 C 222.569 15.160,222.188 14.800,221.837 14.800 C 221.487 14.800,221.200 14.526,221.200 14.190 C 221.200 13.855,220.750 13.409,220.200 13.200 C 219.650 12.991,219.200 12.644,219.200 12.428 C 219.200 12.213,218.587 11.921,217.837 11.781 C 216.968 11.618,216.401 11.248,216.274 10.762 C 216.165 10.343,215.788 10.000,215.437 10.000 C 215.087 10.000,214.800 9.730,214.800 9.400 C 214.800 9.067,214.444 8.800,214.000 8.800 C 213.467 8.800,213.200 8.533,213.200 8.000 C 213.200 7.483,212.933 7.200,212.447 7.200 C 212.030 7.200,211.600 6.843,211.484 6.400 C 211.324 5.787,210.938 5.600,209.837 5.600 C 208.667 5.600,208.400 5.452,208.400 4.800 C 208.400 4.360,208.151 4.000,207.847 4.000 C 207.542 4.000,207.199 3.640,207.084 3.200 C 206.969 2.760,206.609 2.400,206.284 2.400 C 205.959 2.400,205.599 2.040,205.484 1.600 C 205.369 1.160,204.988 0.800,204.637 0.800 C 204.287 0.800,204.000 0.620,204.000 0.400 C 204.000 0.178,202.933 0.000,201.600 0.000 L 199.200 0.000 199.200 37.200 " stroke="none" fill="#000000" fill-rule="evenodd"></path><path id="path4" d="M199.200 37.200 L 199.200 74.400 188.443 74.400 C 179.250 74.400,177.652 74.487,177.455 75.000 C 177.278 75.462,176.507 75.601,174.113 75.604 C 170.054 75.610,168.000 75.962,168.000 76.652 C 168.000 77.065,167.285 77.201,165.100 77.205 C 161.724 77.212,160.400 77.492,160.400 78.202 C 160.400 78.550,159.505 78.760,157.556 78.870 C 155.467 78.988,154.580 79.213,154.212 79.716 C 153.850 80.211,153.132 80.400,151.618 80.400 C 149.862 80.400,149.491 80.529,149.316 81.200 C 149.140 81.872,148.770 82.000,147.000 82.000 C 145.230 82.000,144.860 82.128,144.684 82.800 C 144.519 83.432,144.138 83.600,142.870 83.600 C 140.880 83.600,140.000 83.920,140.000 84.643 C 140.000 85.026,139.501 85.200,138.400 85.200 C 137.067 85.200,136.800 85.333,136.800 86.000 C 136.800 86.667,136.533 86.800,135.200 86.800 C 134.133 86.800,133.333 87.067,132.800 87.600 C 132.345 88.055,131.467 88.400,130.763 88.400 C 129.862 88.400,129.468 88.617,129.316 89.200 C 129.152 89.827,128.770 90.000,127.553 90.000 C 126.267 90.000,126.000 90.137,126.000 90.800 C 126.000 91.449,125.733 91.600,124.587 91.600 C 123.728 91.600,123.088 91.825,122.954 92.176 C 122.833 92.492,122.210 92.866,121.571 93.006 C 120.932 93.147,120.300 93.439,120.166 93.655 C 120.032 93.872,119.490 94.214,118.961 94.415 C 118.433 94.616,118.000 95.055,118.000 95.390 C 118.000 95.823,117.584 96.000,116.563 96.000 C 115.485 96.000,115.075 96.191,114.926 96.762 C 114.799 97.248,114.232 97.618,113.363 97.781 C 112.554 97.932,112.000 98.273,112.000 98.618 C 112.000 98.942,111.629 99.200,111.163 99.200 C 110.662 99.200,110.241 99.521,110.116 100.000 C 109.966 100.574,109.570 100.800,108.716 100.800 C 107.862 100.800,107.466 101.026,107.316 101.600 C 107.200 102.043,106.770 102.400,106.353 102.400 C 105.867 102.400,105.600 102.683,105.600 103.200 C 105.600 103.697,105.333 104.000,104.896 104.000 C 104.509 104.000,103.968 104.360,103.693 104.800 C 103.374 105.310,102.760 105.600,101.997 105.600 C 101.067 105.600,100.800 105.778,100.800 106.400 C 100.800 106.933,100.533 107.200,100.000 107.200 C 99.467 107.200,99.200 107.467,99.200 108.000 C 99.200 108.533,98.933 108.800,98.400 108.800 C 97.960 108.800,97.600 109.050,97.600 109.355 C 97.600 109.674,97.002 110.023,96.200 110.174 C 95.428 110.318,94.800 110.676,94.800 110.971 C 94.800 111.266,94.440 111.601,94.000 111.716 C 93.560 111.831,93.200 112.212,93.200 112.563 C 93.200 112.933,92.865 113.200,92.400 113.200 C 91.867 113.200,91.600 113.467,91.600 114.000 C 91.600 114.533,91.333 114.800,90.800 114.800 C 90.267 114.800,90.000 115.067,90.000 115.600 C 90.000 116.133,89.733 116.400,89.200 116.400 C 88.667 116.400,88.400 116.667,88.400 117.200 C 88.400 117.733,88.133 118.000,87.600 118.000 C 87.067 118.000,86.800 118.267,86.800 118.800 C 86.800 119.333,86.533 119.600,86.000 119.600 C 85.467 119.600,85.200 119.867,85.200 120.400 C 85.200 120.933,84.933 121.200,84.400 121.200 C 83.867 121.200,83.600 121.467,83.600 122.000 C 83.600 122.533,83.333 122.800,82.800 122.800 C 82.267 122.800,82.000 123.067,82.000 123.600 C 82.000 124.133,81.733 124.400,81.200 124.400 C 80.760 124.400,80.400 124.658,80.400 124.973 C 80.400 125.288,80.040 125.660,79.600 125.800 C 79.160 125.940,78.800 126.291,78.800 126.580 C 78.800 126.870,78.440 127.201,78.000 127.316 C 77.560 127.431,77.200 127.812,77.200 128.163 C 77.200 128.513,76.930 128.800,76.600 128.800 C 76.267 128.800,76.000 129.156,76.000 129.600 C 76.000 130.133,75.733 130.400,75.200 130.400 C 74.683 130.400,74.400 130.667,74.400 131.153 C 74.400 131.570,74.043 132.000,73.600 132.116 C 73.060 132.257,72.800 132.662,72.800 133.359 C 72.800 133.960,72.465 134.603,72.000 134.893 C 71.560 135.168,71.200 135.709,71.200 136.096 C 71.200 136.533,70.897 136.800,70.400 136.800 C 69.867 136.800,69.600 137.067,69.600 137.600 C 69.600 138.133,69.333 138.400,68.800 138.400 C 68.263 138.400,68.000 138.667,68.000 139.213 C 68.000 139.659,67.741 140.124,67.424 140.246 C 67.108 140.367,66.735 140.984,66.597 141.615 C 66.457 142.249,65.998 142.874,65.572 143.009 C 65.147 143.144,64.800 143.602,64.800 144.027 C 64.800 144.452,64.549 144.800,64.243 144.800 C 63.631 144.800,63.200 145.641,63.200 146.833 C 63.200 147.255,62.926 147.600,62.590 147.600 C 62.255 147.600,61.809 148.050,61.600 148.600 C 61.391 149.150,61.044 149.600,60.828 149.600 C 60.613 149.600,60.318 150.230,60.174 151.000 C 60.023 151.802,59.674 152.400,59.355 152.400 C 59.035 152.400,58.800 152.809,58.800 153.367 C 58.800 154.748,58.402 155.600,57.757 155.600 C 57.451 155.600,57.200 155.917,57.200 156.304 C 57.200 156.691,56.840 157.232,56.400 157.507 C 55.901 157.819,55.600 158.440,55.600 159.157 C 55.600 159.970,55.366 160.368,54.800 160.516 C 54.222 160.667,54.000 161.062,54.000 161.936 C 54.000 162.795,53.768 163.220,53.200 163.400 C 52.620 163.584,52.400 164.005,52.400 164.931 C 52.400 165.774,52.129 166.377,51.600 166.707 C 51.018 167.071,50.800 167.640,50.800 168.800 C 50.800 169.960,50.582 170.529,50.000 170.893 C 49.430 171.249,49.200 171.826,49.200 172.896 C 49.200 174.133,49.058 174.400,48.400 174.400 C 47.733 174.400,47.600 174.667,47.600 176.000 C 47.600 177.096,47.426 177.600,47.047 177.600 C 46.416 177.600,46.013 178.800,46.005 180.700 C 46.002 181.542,45.804 182.000,45.443 182.000 C 44.704 182.000,44.400 182.886,44.400 185.033 C 44.400 186.266,44.234 186.800,43.850 186.800 C 43.283 186.800,42.800 188.460,42.800 190.407 C 42.800 191.022,42.533 191.617,42.200 191.745 C 41.747 191.919,41.600 192.651,41.600 194.741 C 41.600 197.170,41.503 197.532,40.800 197.716 C 40.078 197.905,40.000 198.262,40.000 201.359 C 40.000 204.360,39.899 204.856,39.200 205.293 C 38.478 205.744,38.400 206.226,38.400 210.250 C 38.400 214.370,38.340 214.722,37.600 214.916 C 36.342 215.245,36.342 259.521,37.600 260.307 C 38.321 260.758,38.400 261.240,38.400 265.207 C 38.400 269.113,38.490 269.685,39.200 270.293 C 39.873 270.869,40.000 271.473,40.000 274.089 C 40.000 276.933,40.069 277.200,40.800 277.200 C 41.529 277.200,41.600 277.467,41.600 280.213 C 41.600 282.521,41.740 283.279,42.200 283.455 C 42.607 283.612,42.800 284.250,42.800 285.443 C 42.800 286.667,43.043 287.443,43.600 288.000 C 44.168 288.568,44.400 289.333,44.400 290.637 C 44.400 292.138,44.546 292.513,45.200 292.684 C 45.844 292.852,46.000 293.230,46.000 294.614 C 46.000 296.716,46.309 297.600,47.043 297.600 C 47.426 297.600,47.600 298.099,47.600 299.200 C 47.600 300.533,47.733 300.800,48.400 300.800 C 49.035 300.800,49.201 301.068,49.205 302.100 C 49.213 304.000,49.616 305.200,50.247 305.200 C 50.615 305.200,50.800 305.680,50.800 306.637 C 50.800 307.738,50.987 308.124,51.600 308.284 C 52.227 308.448,52.400 308.830,52.400 310.047 C 52.400 311.333,52.537 311.600,53.200 311.600 C 53.852 311.600,54.000 311.867,54.000 313.037 C 54.000 314.138,54.187 314.524,54.800 314.684 C 55.397 314.840,55.600 315.230,55.600 316.220 C 55.600 317.195,55.812 317.613,56.400 317.800 C 56.840 317.940,57.200 318.402,57.200 318.827 C 57.200 319.252,57.451 319.600,57.757 319.600 C 58.371 319.600,58.800 320.441,58.800 321.645 C 58.800 322.074,59.065 322.527,59.389 322.651 C 59.713 322.776,60.093 323.490,60.234 324.239 C 60.379 325.011,60.729 325.600,61.045 325.600 C 61.350 325.600,61.600 325.960,61.600 326.400 C 61.600 326.933,61.867 327.200,62.400 327.200 C 63.052 327.200,63.200 327.467,63.200 328.637 C 63.200 329.738,63.387 330.124,64.000 330.284 C 64.443 330.400,64.800 330.830,64.800 331.247 C 64.800 331.733,65.083 332.000,65.600 332.000 C 66.224 332.000,66.400 332.267,66.400 333.213 C 66.400 333.948,66.648 334.520,67.031 334.667 C 67.377 334.800,67.823 335.335,68.021 335.855 C 68.218 336.375,68.655 336.800,68.990 336.800 C 69.333 336.800,69.600 337.150,69.600 337.600 C 69.600 338.133,69.867 338.400,70.400 338.400 C 70.933 338.400,71.200 338.667,71.200 339.200 C 71.200 339.640,71.560 340.360,72.000 340.800 C 72.440 341.240,72.800 341.870,72.800 342.200 C 72.800 342.533,73.156 342.800,73.600 342.800 C 74.133 342.800,74.400 343.067,74.400 343.600 C 74.400 344.040,74.658 344.400,74.973 344.400 C 75.288 344.400,75.660 344.760,75.800 345.200 C 75.940 345.640,76.312 346.000,76.627 346.000 C 76.942 346.000,77.200 346.360,77.200 346.800 C 77.200 347.333,77.467 347.600,78.000 347.600 C 78.533 347.600,78.800 347.867,78.800 348.400 C 78.800 348.933,79.067 349.200,79.600 349.200 C 80.133 349.200,80.400 349.467,80.400 350.000 C 80.400 350.533,80.667 350.800,81.200 350.800 C 81.733 350.800,82.000 351.067,82.000 351.600 C 82.000 352.133,82.267 352.400,82.800 352.400 C 83.333 352.400,83.600 352.667,83.600 353.200 C 83.600 353.733,83.867 354.000,84.400 354.000 C 84.933 354.000,85.200 354.267,85.200 354.800 C 85.200 355.333,85.467 355.600,86.000 355.600 C 86.465 355.600,86.800 355.867,86.800 356.237 C 86.800 356.588,87.160 356.969,87.600 357.084 C 88.040 357.199,88.400 357.542,88.400 357.847 C 88.400 358.151,88.760 358.400,89.200 358.400 C 89.733 358.400,90.000 358.667,90.000 359.200 C 90.000 359.733,90.267 360.000,90.800 360.000 C 91.317 360.000,91.600 360.267,91.600 360.753 C 91.600 361.170,91.957 361.600,92.400 361.716 C 92.840 361.831,93.200 362.212,93.200 362.563 C 93.200 362.913,93.458 363.200,93.773 363.200 C 94.088 363.200,94.460 363.560,94.600 364.000 C 94.740 364.440,95.202 364.800,95.627 364.800 C 96.052 364.800,96.400 365.062,96.400 365.382 C 96.400 365.730,96.962 366.069,97.800 366.226 C 98.813 366.416,99.200 366.698,99.200 367.245 C 99.200 367.733,99.482 368.000,100.000 368.000 C 100.533 368.000,100.800 368.267,100.800 368.800 C 100.800 369.318,101.067 369.600,101.557 369.600 C 101.974 369.600,102.414 369.860,102.536 370.178 C 102.658 370.496,103.397 370.876,104.179 371.022 C 105.211 371.216,105.600 371.496,105.600 372.045 C 105.600 372.533,105.882 372.800,106.400 372.800 C 106.840 372.800,107.200 373.050,107.200 373.355 C 107.200 373.674,107.798 374.023,108.600 374.174 C 109.438 374.331,110.000 374.670,110.000 375.018 C 110.000 375.338,110.348 375.600,110.773 375.600 C 111.198 375.600,111.660 375.960,111.800 376.400 C 111.989 376.995,112.405 377.200,113.427 377.200 C 114.533 377.200,114.800 377.355,114.800 378.000 C 114.800 378.622,115.067 378.800,115.997 378.800 C 116.760 378.800,117.374 379.090,117.693 379.600 C 117.968 380.040,118.488 380.400,118.850 380.400 C 119.211 380.400,119.601 380.760,119.716 381.200 C 119.876 381.813,120.262 382.000,121.363 382.000 C 122.533 382.000,122.800 382.148,122.800 382.800 C 122.800 383.467,123.067 383.600,124.400 383.600 C 125.733 383.600,126.000 383.733,126.000 384.400 C 126.000 385.045,126.267 385.200,127.373 385.200 C 128.395 385.200,128.811 385.405,129.000 386.000 C 129.187 386.589,129.605 386.800,130.584 386.800 C 131.375 386.800,132.004 387.034,132.136 387.378 C 132.258 387.696,133.042 388.082,133.879 388.236 C 134.716 388.390,135.829 388.850,136.354 389.258 C 136.879 389.666,137.914 390.000,138.654 390.000 C 139.528 390.000,140.000 390.192,140.000 390.549 C 140.000 390.918,140.675 391.163,142.054 391.296 C 143.383 391.423,144.238 391.724,144.474 392.146 C 144.743 392.627,145.419 392.800,147.020 392.800 C 148.933 392.800,149.200 392.898,149.200 393.600 C 149.200 394.311,149.467 394.400,151.600 394.400 C 153.733 394.400,154.000 394.489,154.000 395.200 C 154.000 395.928,154.267 396.000,156.973 396.000 C 159.595 396.000,159.976 396.095,160.200 396.800 C 160.423 397.504,160.805 397.600,163.380 397.600 C 165.970 397.600,166.331 397.692,166.516 398.400 C 166.710 399.142,167.062 399.200,171.363 399.200 C 174.188 399.200,176.000 399.356,176.000 399.600 C 176.000 399.862,184.267 400.000,200.000 400.000 C 215.733 400.000,224.000 399.862,224.000 399.600 C 224.000 399.356,225.812 399.200,228.637 399.200 C 232.938 399.200,233.290 399.142,233.484 398.400 C 233.671 397.685,234.030 397.600,236.843 397.600 C 239.560 397.600,240.062 397.490,240.493 396.800 C 240.906 396.138,241.426 396.000,243.496 396.000 C 245.733 396.000,246.000 395.915,246.000 395.200 C 246.000 394.489,246.267 394.400,248.400 394.400 C 250.267 394.400,250.978 394.222,251.600 393.600 C 252.107 393.093,252.933 392.800,253.856 392.800 C 254.729 392.800,255.499 392.544,255.780 392.159 C 256.043 391.800,257.073 391.426,258.124 391.307 C 259.239 391.182,260.000 390.894,260.000 390.599 C 260.000 390.293,260.790 390.026,262.054 389.904 C 263.383 389.777,264.238 389.476,264.474 389.054 C 264.675 388.694,265.266 388.400,265.787 388.400 C 267.149 388.400,268.000 387.999,268.000 387.357 C 268.000 386.984,268.475 386.800,269.437 386.800 C 270.538 386.800,270.924 386.613,271.084 386.000 C 271.241 385.399,271.630 385.200,272.647 385.200 C 273.733 385.200,274.000 385.042,274.000 384.400 C 274.000 383.733,274.267 383.600,275.600 383.600 C 276.933 383.600,277.200 383.467,277.200 382.800 C 277.200 382.133,277.467 382.000,278.800 382.000 C 280.133 382.000,280.400 381.867,280.400 381.200 C 280.400 380.578,280.667 380.400,281.597 380.400 C 282.360 380.400,282.974 380.110,283.293 379.600 C 283.568 379.160,284.109 378.800,284.496 378.800 C 284.933 378.800,285.200 378.497,285.200 378.000 C 285.200 377.348,285.467 377.200,286.637 377.200 C 287.738 377.200,288.124 377.013,288.284 376.400 C 288.400 375.955,288.830 375.600,289.251 375.600 C 289.667 375.600,290.316 375.240,290.693 374.800 C 291.070 374.360,291.698 374.000,292.089 374.000 C 292.480 374.000,292.800 373.730,292.800 373.400 C 292.800 373.067,293.156 372.800,293.600 372.800 C 294.133 372.800,294.400 372.533,294.400 372.000 C 294.400 371.421,294.667 371.200,295.367 371.200 C 296.748 371.200,297.600 370.802,297.600 370.157 C 297.600 369.851,297.960 369.600,298.400 369.600 C 298.933 369.600,299.200 369.333,299.200 368.800 C 299.200 368.267,299.467 368.000,300.000 368.000 C 300.533 368.000,300.800 367.733,300.800 367.200 C 300.800 366.576,301.067 366.400,302.013 366.400 C 302.748 366.400,303.320 366.152,303.467 365.769 C 303.600 365.423,304.135 364.977,304.655 364.779 C 305.175 364.582,305.600 364.166,305.600 363.857 C 305.600 363.547,305.960 363.199,306.400 363.084 C 306.840 362.969,307.200 362.588,307.200 362.237 C 307.200 361.887,307.470 361.600,307.800 361.600 C 308.133 361.600,308.400 361.244,308.400 360.800 C 308.400 360.267,308.667 360.000,309.200 360.000 C 309.733 360.000,310.000 359.733,310.000 359.200 C 310.000 358.667,310.267 358.400,310.800 358.400 C 311.240 358.400,311.600 358.232,311.600 358.027 C 311.600 357.822,311.916 357.554,312.302 357.431 C 313.725 356.979,321.200 349.174,321.200 348.139 C 321.200 347.843,321.560 347.600,322.000 347.600 C 322.533 347.600,322.800 347.333,322.800 346.800 C 322.800 346.360,323.058 346.000,323.373 346.000 C 323.688 346.000,324.060 345.640,324.200 345.200 C 324.340 344.760,324.712 344.400,325.027 344.400 C 325.342 344.400,325.600 344.040,325.600 343.600 C 325.600 343.067,325.867 342.800,326.400 342.800 C 326.933 342.800,327.200 342.533,327.200 342.000 C 327.200 341.467,327.467 341.200,328.000 341.200 C 328.648 341.200,328.800 340.933,328.800 339.800 C 328.800 338.667,328.952 338.400,329.600 338.400 C 330.133 338.400,330.400 338.133,330.400 337.600 C 330.400 337.067,330.667 336.800,331.200 336.800 C 331.717 336.800,332.000 336.533,332.000 336.047 C 332.000 335.630,332.357 335.200,332.800 335.084 C 333.413 334.924,333.600 334.538,333.600 333.437 C 333.600 332.267,333.748 332.000,334.400 332.000 C 334.917 332.000,335.200 331.733,335.200 331.247 C 335.200 330.830,335.557 330.400,336.000 330.284 C 336.540 330.143,336.800 329.738,336.800 329.041 C 336.800 328.440,337.135 327.797,337.600 327.507 C 338.040 327.232,338.400 326.691,338.400 326.304 C 338.400 325.917,338.662 325.600,338.982 325.600 C 339.330 325.600,339.669 325.038,339.826 324.200 C 339.977 323.398,340.326 322.800,340.645 322.800 C 340.950 322.800,341.200 322.446,341.200 322.014 C 341.200 321.582,341.560 321.035,342.000 320.800 C 342.513 320.526,342.800 319.962,342.800 319.233 C 342.800 318.430,343.036 318.032,343.600 317.884 C 344.213 317.724,344.400 317.338,344.400 316.237 C 344.400 315.067,344.548 314.800,345.200 314.800 C 345.867 314.800,346.000 314.533,346.000 313.200 C 346.000 311.867,346.133 311.600,346.800 311.600 C 347.467 311.600,347.600 311.333,347.600 310.000 C 347.600 308.667,347.733 308.400,348.400 308.400 C 349.052 308.400,349.200 308.133,349.200 306.963 C 349.200 305.862,349.387 305.476,350.000 305.316 C 350.601 305.159,350.800 304.770,350.800 303.753 C 350.800 302.933,351.115 302.085,351.600 301.600 C 352.125 301.075,352.400 300.267,352.400 299.247 C 352.400 298.030,352.573 297.648,353.200 297.484 C 353.853 297.313,354.000 296.938,354.000 295.441 C 354.000 294.040,354.189 293.489,354.800 293.107 C 355.409 292.727,355.600 292.174,355.600 290.793 C 355.600 289.473,355.818 288.791,356.400 288.293 C 357.002 287.777,357.200 287.113,357.200 285.604 C 357.200 284.089,357.347 283.600,357.800 283.600 C 358.267 283.600,358.400 283.067,358.400 281.200 C 358.400 279.333,358.578 278.622,359.200 278.000 C 359.856 277.344,360.000 276.667,360.000 274.247 C 360.000 271.630,360.091 271.269,360.800 271.084 C 361.542 270.890,361.600 270.538,361.600 266.237 C 361.600 261.867,361.646 261.600,362.400 261.600 C 363.175 261.600,363.200 261.333,363.200 253.020 C 363.200 245.264,363.267 244.402,363.900 244.048 C 364.462 243.733,364.628 242.982,364.741 240.228 L 364.882 236.800 338.241 236.800 L 311.600 236.800 311.600 239.469 C 311.600 241.449,311.419 242.336,310.900 242.910 C 310.316 243.554,310.177 244.652,310.061 249.526 C 309.962 253.669,309.771 255.490,309.406 255.785 C 309.096 256.035,308.807 257.537,308.679 259.565 C 308.522 262.060,308.303 263.023,307.833 263.285 C 307.344 263.559,307.200 264.317,307.200 266.620 C 307.200 269.333,307.128 269.600,306.400 269.600 C 305.689 269.600,305.600 269.867,305.600 272.000 C 305.600 274.133,305.511 274.400,304.800 274.400 C 304.137 274.400,304.000 274.667,304.000 275.953 C 304.000 277.170,303.827 277.552,303.200 277.716 C 302.532 277.891,302.400 278.262,302.400 279.963 C 302.400 281.733,302.295 282.000,301.600 282.000 C 300.933 282.000,300.800 282.267,300.800 283.600 C 300.800 284.933,300.667 285.200,300.000 285.200 C 299.333 285.200,299.200 285.467,299.200 286.800 C 299.200 288.133,299.067 288.400,298.400 288.400 C 297.733 288.400,297.600 288.667,297.600 290.000 C 297.600 291.333,297.467 291.600,296.800 291.600 C 296.282 291.600,296.000 291.867,296.000 292.357 C 296.000 292.774,295.747 293.212,295.438 293.330 C 295.128 293.449,294.754 294.098,294.606 294.773 C 294.458 295.448,294.097 296.000,293.803 296.000 C 293.493 296.000,293.157 296.669,293.000 297.600 C 292.834 298.584,292.512 299.200,292.165 299.200 C 291.854 299.200,291.600 299.560,291.600 300.000 C 291.600 300.533,291.333 300.800,290.800 300.800 C 290.271 300.800,290.000 301.067,290.000 301.586 C 290.000 302.018,289.640 302.565,289.200 302.800 C 288.676 303.080,288.400 303.638,288.400 304.414 C 288.400 305.333,288.220 305.600,287.600 305.600 C 287.067 305.600,286.800 305.867,286.800 306.400 C 286.800 306.933,286.533 307.200,286.000 307.200 C 285.467 307.200,285.200 307.467,285.200 308.000 C 285.200 308.533,284.933 308.800,284.400 308.800 C 283.867 308.800,283.600 309.067,283.600 309.600 C 283.600 310.052,283.333 310.400,282.987 310.400 C 282.651 310.400,282.263 310.692,282.126 311.050 C 281.989 311.407,281.186 312.442,280.343 313.350 C 279.500 314.257,278.808 315.315,278.805 315.700 C 278.802 316.132,278.493 316.400,278.000 316.400 C 277.544 316.400,277.200 316.667,277.200 317.021 C 277.200 317.362,276.660 317.830,276.000 318.060 C 275.340 318.290,274.800 318.645,274.800 318.849 C 274.800 319.053,274.350 319.391,273.800 319.600 C 273.250 319.809,272.800 320.255,272.800 320.590 C 272.800 320.933,272.450 321.200,272.000 321.200 C 271.467 321.200,271.200 321.467,271.200 322.000 C 271.200 322.533,270.933 322.800,270.400 322.800 C 269.867 322.800,269.600 323.067,269.600 323.600 C 269.600 324.133,269.333 324.400,268.800 324.400 C 268.360 324.400,268.000 324.656,268.000 324.968 C 268.000 325.281,267.448 325.658,266.773 325.806 C 266.098 325.954,265.455 326.312,265.344 326.602 C 265.233 326.891,264.705 327.237,264.171 327.372 C 263.637 327.506,263.200 327.861,263.200 328.161 C 263.200 328.461,262.840 328.801,262.400 328.916 C 261.960 329.031,261.600 329.412,261.600 329.763 C 261.600 330.224,261.214 330.400,260.200 330.400 C 259.094 330.400,258.800 330.559,258.800 331.155 C 258.800 331.704,258.411 331.984,257.379 332.178 C 256.597 332.324,255.858 332.704,255.736 333.022 C 255.614 333.340,255.174 333.600,254.757 333.600 C 254.267 333.600,254.000 333.882,254.000 334.400 C 254.000 335.067,253.733 335.200,252.400 335.200 C 251.067 335.200,250.800 335.333,250.800 336.000 C 250.800 336.667,250.533 336.800,249.200 336.800 C 247.867 336.800,247.600 336.933,247.600 337.600 C 247.600 338.252,247.333 338.400,246.163 338.400 C 245.062 338.400,244.676 338.587,244.516 339.200 C 244.342 339.865,243.970 340.000,242.316 340.000 C 240.662 340.000,240.290 340.135,240.116 340.800 C 239.952 341.427,239.570 341.600,238.353 341.600 C 237.239 341.600,236.800 341.770,236.800 342.200 C 236.800 342.643,236.337 342.800,235.033 342.800 C 232.886 342.800,232.000 343.104,232.000 343.843 C 232.000 344.256,231.389 344.400,229.633 344.400 C 226.940 344.400,226.000 344.659,226.000 345.403 C 226.000 345.778,225.000 345.959,222.368 346.060 C 219.478 346.171,218.630 346.343,218.223 346.900 C 217.776 347.512,216.970 347.600,211.818 347.600 C 206.262 347.600,205.913 347.646,205.716 348.400 C 205.519 349.151,205.170 349.200,200.000 349.200 C 194.830 349.200,194.481 349.151,194.284 348.400 C 194.087 347.646,193.738 347.600,188.237 347.600 C 182.933 347.600,182.327 347.527,181.600 346.800 C 180.925 346.125,180.267 346.000,177.400 346.000 C 174.761 346.000,174.000 345.875,174.000 345.443 C 174.000 344.679,173.105 344.400,170.656 344.400 C 169.073 344.400,168.415 344.209,167.893 343.600 C 167.423 343.051,166.713 342.800,165.632 342.800 C 164.766 342.800,163.787 342.530,163.457 342.200 C 163.127 341.870,162.214 341.600,161.429 341.600 C 160.267 341.600,160.000 341.451,160.000 340.800 C 160.000 340.119,159.733 340.000,158.203 340.000 C 156.840 340.000,156.286 339.807,155.907 339.200 C 155.551 338.630,154.974 338.400,153.904 338.400 C 152.667 338.400,152.400 338.258,152.400 337.600 C 152.400 336.933,152.133 336.800,150.800 336.800 C 149.467 336.800,149.200 336.667,149.200 336.000 C 149.200 335.333,148.933 335.200,147.600 335.200 C 146.267 335.200,146.000 335.067,146.000 334.400 C 146.000 333.867,145.733 333.600,145.200 333.600 C 144.760 333.600,144.400 333.349,144.400 333.043 C 144.400 332.398,143.548 332.000,142.167 332.000 C 141.467 332.000,141.200 331.779,141.200 331.200 C 141.200 330.667,140.933 330.400,140.400 330.400 C 139.960 330.400,139.240 330.040,138.800 329.600 C 138.360 329.160,137.730 328.800,137.400 328.800 C 137.070 328.800,136.800 328.526,136.800 328.190 C 136.800 327.855,136.350 327.409,135.800 327.200 C 135.250 326.991,134.800 326.655,134.800 326.454 C 134.800 326.253,134.170 325.971,133.400 325.826 C 132.562 325.669,132.000 325.330,132.000 324.982 C 132.000 324.662,131.640 324.400,131.200 324.400 C 130.667 324.400,130.400 324.133,130.400 323.600 C 130.400 323.067,130.133 322.800,129.600 322.800 C 129.067 322.800,128.800 322.533,128.800 322.000 C 128.800 321.467,128.533 321.200,128.000 321.200 C 127.467 321.200,127.200 320.933,127.200 320.400 C 127.200 319.867,126.933 319.600,126.400 319.600 C 125.935 319.600,125.600 319.333,125.600 318.963 C 125.600 318.612,125.240 318.231,124.800 318.116 C 124.360 318.001,124.000 317.658,124.000 317.353 C 124.000 317.049,123.852 316.800,123.672 316.800 C 123.141 316.800,120.800 314.570,120.800 314.064 C 120.800 313.809,120.542 313.600,120.227 313.600 C 119.912 313.600,119.540 313.240,119.400 312.800 C 119.260 312.360,118.888 312.000,118.573 312.000 C 118.258 312.000,118.000 311.661,118.000 311.247 C 118.000 310.830,117.643 310.400,117.200 310.284 C 116.760 310.169,116.400 309.788,116.400 309.437 C 116.400 309.067,116.065 308.800,115.600 308.800 C 115.067 308.800,114.800 308.533,114.800 308.000 C 114.800 307.467,114.533 307.200,114.000 307.200 C 113.467 307.200,113.200 306.933,113.200 306.400 C 113.200 305.867,112.933 305.600,112.400 305.600 C 111.748 305.600,111.600 305.333,111.600 304.163 C 111.600 303.062,111.413 302.676,110.800 302.516 C 110.357 302.400,110.000 301.970,110.000 301.553 C 110.000 301.067,109.717 300.800,109.200 300.800 C 108.576 300.800,108.400 300.533,108.400 299.587 C 108.400 298.913,108.150 298.279,107.836 298.159 C 107.526 298.039,107.163 297.505,107.028 296.971 C 106.894 296.437,106.538 296.000,106.237 296.000 C 105.927 296.000,105.575 295.391,105.426 294.600 C 105.269 293.762,104.930 293.200,104.582 293.200 C 104.262 293.200,104.000 292.874,104.000 292.475 C 104.000 292.077,103.640 291.364,103.200 290.892 C 102.760 290.420,102.400 289.666,102.400 289.217 C 102.400 288.667,102.139 288.400,101.600 288.400 C 100.933 288.400,100.800 288.133,100.800 286.800 C 100.800 285.467,100.667 285.200,100.000 285.200 C 99.333 285.200,99.200 284.933,99.200 283.600 C 99.200 282.533,98.933 281.733,98.400 281.200 C 97.911 280.711,97.600 279.867,97.600 279.027 C 97.600 278.005,97.395 277.589,96.800 277.400 C 96.140 277.190,96.000 276.795,96.000 275.136 C 96.000 273.462,95.866 273.090,95.200 272.916 C 94.523 272.739,94.400 272.370,94.400 270.516 C 94.400 268.662,94.277 268.293,93.600 268.116 C 92.916 267.937,92.800 267.570,92.800 265.582 C 92.800 263.998,92.599 263.056,92.169 262.626 C 91.756 262.213,91.457 260.928,91.304 258.904 C 91.172 257.152,90.839 255.581,90.535 255.278 C 89.583 254.326,89.645 221.098,90.600 220.143 C 90.865 219.878,91.181 218.212,91.302 216.441 C 91.452 214.262,91.730 213.013,92.161 212.581 C 92.614 212.129,92.800 211.193,92.800 209.371 C 92.800 207.067,92.883 206.800,93.600 206.800 C 94.302 206.800,94.400 206.533,94.400 204.627 C 94.400 202.805,94.529 202.413,95.200 202.200 C 95.871 201.987,96.000 201.595,96.000 199.773 C 96.000 197.867,96.098 197.600,96.800 197.600 C 97.463 197.600,97.600 197.333,97.600 196.047 C 97.600 194.830,97.773 194.448,98.400 194.284 C 99.052 194.113,99.200 193.738,99.200 192.252 C 99.200 190.838,99.380 190.332,100.000 190.000 C 100.440 189.765,100.800 189.246,100.800 188.848 C 100.800 188.450,101.160 187.798,101.600 187.400 C 102.040 187.002,102.400 186.254,102.400 185.738 C 102.400 185.184,102.638 184.800,102.982 184.800 C 103.330 184.800,103.669 184.238,103.826 183.400 C 103.971 182.630,104.320 182.000,104.602 182.000 C 105.199 182.000,105.600 181.121,105.600 179.814 C 105.600 179.230,105.892 178.817,106.400 178.684 C 106.840 178.569,107.200 178.188,107.200 177.837 C 107.200 177.487,107.470 177.200,107.800 177.200 C 108.217 177.200,108.400 176.781,108.400 175.827 C 108.400 174.805,108.605 174.389,109.200 174.200 C 109.640 174.060,110.000 173.700,110.000 173.400 C 110.000 173.100,110.360 172.740,110.800 172.600 C 111.240 172.460,111.600 172.088,111.600 171.773 C 111.600 171.458,111.960 170.840,112.400 170.400 C 112.840 169.960,113.200 169.240,113.200 168.800 C 113.200 168.267,113.467 168.000,114.000 168.000 C 114.533 168.000,114.800 167.733,114.800 167.200 C 114.800 166.667,115.067 166.400,115.600 166.400 C 116.133 166.400,116.400 166.133,116.400 165.600 C 116.400 165.067,116.667 164.800,117.200 164.800 C 117.717 164.800,118.000 164.533,118.000 164.047 C 118.000 163.630,118.357 163.200,118.800 163.084 C 119.240 162.969,119.600 162.588,119.600 162.237 C 119.600 161.887,119.858 161.600,120.173 161.600 C 120.488 161.600,120.860 161.240,121.000 160.800 C 121.140 160.360,121.512 160.000,121.827 160.000 C 122.142 160.000,122.400 159.640,122.400 159.200 C 122.400 158.667,122.667 158.400,123.200 158.400 C 123.665 158.400,124.000 158.133,124.000 157.763 C 124.000 157.412,124.360 157.031,124.800 156.916 C 125.240 156.801,125.600 156.479,125.600 156.200 C 125.600 155.921,125.960 155.599,126.400 155.484 C 126.840 155.369,127.200 154.988,127.200 154.637 C 127.200 154.267,127.535 154.000,128.000 154.000 C 128.533 154.000,128.800 153.733,128.800 153.200 C 128.800 152.667,129.067 152.400,129.600 152.400 C 130.133 152.400,130.400 152.133,130.400 151.600 C 130.400 151.067,130.667 150.800,131.200 150.800 C 131.640 150.800,132.360 150.440,132.800 150.000 C 133.240 149.560,133.887 149.200,134.237 149.200 C 134.588 149.200,134.969 148.840,135.084 148.400 C 135.200 147.957,135.630 147.600,136.047 147.600 C 136.533 147.600,136.800 147.317,136.800 146.800 C 136.800 146.172,137.067 146.000,138.037 146.000 C 138.938 146.000,139.332 145.783,139.484 145.200 C 139.600 144.757,140.030 144.400,140.447 144.400 C 140.933 144.400,141.200 144.117,141.200 143.600 C 141.200 142.933,141.467 142.800,142.800 142.800 C 144.133 142.800,144.400 142.667,144.400 142.000 C 144.400 141.352,144.667 141.200,145.800 141.200 C 146.570 141.200,147.200 141.022,147.200 140.805 C 147.200 140.588,147.808 140.157,148.551 139.846 C 149.294 139.536,150.025 139.083,150.175 138.841 C 150.325 138.598,150.790 138.400,151.210 138.400 C 151.629 138.400,152.165 138.040,152.400 137.600 C 152.699 137.042,153.238 136.800,154.181 136.800 C 155.930 136.800,156.800 136.454,156.800 135.757 C 156.800 135.374,157.299 135.200,158.400 135.200 C 159.733 135.200,160.000 135.067,160.000 134.400 C 160.000 133.695,160.267 133.600,162.237 133.600 C 164.138 133.600,164.506 133.480,164.684 132.800 C 164.860 132.127,165.230 132.000,167.020 132.000 C 168.795 132.000,169.188 131.868,169.400 131.200 C 169.619 130.509,170.005 130.400,172.224 130.400 C 174.360 130.400,174.877 130.265,175.293 129.600 C 175.723 128.912,176.226 128.800,178.896 128.800 C 181.467 128.800,182.137 128.663,182.800 128.000 C 183.545 127.255,184.133 127.200,191.400 127.200 L 199.200 127.200 199.200 164.000 L 199.200 200.800 201.373 200.800 C 203.153 200.800,203.589 200.663,203.786 200.043 C 203.918 199.627,204.381 199.194,204.813 199.081 C 205.246 198.967,205.600 198.609,205.600 198.284 C 205.600 197.959,205.960 197.599,206.400 197.484 C 206.840 197.369,207.200 196.988,207.200 196.637 C 207.200 196.287,207.430 196.000,207.712 196.000 C 207.993 196.000,208.483 195.640,208.800 195.200 C 209.139 194.730,209.835 194.400,210.488 194.400 C 211.333 194.400,211.600 194.208,211.600 193.600 C 211.600 193.067,211.867 192.800,212.400 192.800 C 212.933 192.800,213.200 192.533,213.200 192.000 C 213.200 191.467,213.467 191.200,214.000 191.200 C 214.444 191.200,214.800 190.933,214.800 190.600 C 214.800 190.270,215.064 190.000,215.386 190.000 C 215.708 190.000,216.165 189.640,216.400 189.200 C 216.635 188.760,217.182 188.400,217.614 188.400 C 218.046 188.400,218.729 188.071,219.131 187.669 C 219.532 187.268,220.162 186.823,220.531 186.682 C 220.899 186.541,221.200 186.170,221.200 185.859 C 221.200 185.548,221.560 185.199,222.000 185.084 C 222.440 184.969,222.800 184.588,222.800 184.237 C 222.800 183.887,223.064 183.600,223.386 183.600 C 223.708 183.600,224.165 183.240,224.400 182.800 C 224.680 182.276,225.238 182.000,226.014 182.000 C 226.933 182.000,227.200 181.820,227.200 181.200 C 227.200 180.667,227.467 180.400,228.000 180.400 C 228.533 180.400,228.800 180.133,228.800 179.600 C 228.800 179.067,229.067 178.800,229.600 178.800 C 230.133 178.800,230.400 178.533,230.400 178.000 C 230.400 177.467,230.667 177.200,231.200 177.200 C 231.640 177.200,232.360 176.840,232.800 176.400 C 233.240 175.960,233.887 175.600,234.237 175.600 C 234.588 175.600,234.969 175.240,235.084 174.800 C 235.200 174.357,235.630 174.000,236.047 174.000 C 236.461 174.000,236.800 173.751,236.800 173.447 C 236.800 173.142,237.160 172.799,237.600 172.684 C 238.040 172.569,238.400 172.188,238.400 171.837 C 238.400 171.487,238.636 171.200,238.925 171.200 C 239.213 171.200,239.836 170.840,240.308 170.400 C 240.780 169.960,241.461 169.600,241.821 169.600 C 242.181 169.600,242.569 169.240,242.684 168.800 C 242.800 168.357,243.230 168.000,243.647 168.000 C 244.133 168.000,244.400 167.717,244.400 167.200 C 244.400 166.667,244.667 166.400,245.200 166.400 C 245.733 166.400,246.000 166.133,246.000 165.600 C 246.000 165.067,246.267 164.800,246.800 164.800 C 247.240 164.800,247.960 164.440,248.400 164.000 C 248.840 163.560,249.487 163.200,249.837 163.200 C 250.188 163.200,250.569 162.840,250.684 162.400 C 250.800 161.957,251.230 161.600,251.647 161.600 C 252.133 161.600,252.400 161.317,252.400 160.800 C 252.400 160.267,252.667 160.000,253.200 160.000 C 253.733 160.000,254.000 159.733,254.000 159.200 C 254.000 158.665,254.267 158.400,254.804 158.400 C 255.246 158.400,255.916 158.040,256.293 157.600 C 256.670 157.160,257.298 156.800,257.689 156.800 C 258.080 156.800,258.400 156.551,258.400 156.247 C 258.400 155.942,258.760 155.599,259.200 155.484 C 259.640 155.369,260.000 154.988,260.000 154.637 C 260.000 154.267,260.335 154.000,260.800 154.000 C 261.333 154.000,261.600 153.733,261.600 153.200 C 261.600 152.703,261.867 152.400,262.304 152.400 C 262.691 152.400,263.232 152.040,263.507 151.600 C 263.797 151.135,264.440 150.800,265.041 150.800 C 265.738 150.800,266.143 150.540,266.284 150.000 C 266.400 149.557,266.830 149.200,267.247 149.200 C 267.733 149.200,268.000 148.917,268.000 148.400 C 268.000 147.867,268.267 147.600,268.800 147.600 C 269.333 147.600,269.600 147.333,269.600 146.800 C 269.600 146.303,269.867 146.000,270.304 146.000 C 270.691 146.000,271.232 145.640,271.507 145.200 C 271.790 144.748,272.440 144.400,273.003 144.400 C 273.733 144.400,274.000 144.186,274.000 143.600 C 274.000 143.067,274.267 142.800,274.800 142.800 C 275.333 142.800,275.600 142.533,275.600 142.000 C 275.600 141.467,275.867 141.200,276.400 141.200 C 276.844 141.200,277.200 140.933,277.200 140.600 C 277.200 140.270,277.517 140.000,277.904 140.000 C 278.291 140.000,278.822 139.656,279.085 139.236 C 279.347 138.816,280.110 138.351,280.781 138.204 C 281.451 138.057,282.000 137.681,282.000 137.368 C 282.000 137.056,282.287 136.800,282.637 136.800 C 282.988 136.800,283.369 136.440,283.484 136.000 C 283.600 135.557,284.030 135.200,284.447 135.200 C 284.933 135.200,285.200 134.917,285.200 134.400 C 285.200 133.903,285.467 133.600,285.904 133.600 C 286.291 133.600,286.832 133.240,287.107 132.800 C 287.390 132.348,288.040 132.000,288.603 132.000 C 289.333 132.000,289.600 131.786,289.600 131.200 C 289.600 130.667,289.867 130.400,290.400 130.400 C 290.933 130.400,291.200 130.133,291.200 129.600 C 291.200 129.067,291.467 128.800,292.000 128.800 C 292.533 128.800,292.800 128.533,292.800 128.000 C 292.800 127.500,293.067 127.200,293.512 127.200 C 293.903 127.200,294.483 126.840,294.800 126.400 C 295.139 125.930,295.835 125.600,296.488 125.600 C 297.333 125.600,297.600 125.408,297.600 124.800 C 297.600 124.267,297.867 124.000,298.400 124.000 C 298.844 124.000,299.200 123.733,299.200 123.400 C 299.200 123.070,299.487 122.800,299.837 122.800 C 300.188 122.800,300.569 122.440,300.684 122.000 C 300.799 121.560,301.204 121.200,301.585 121.200 C 301.965 121.200,302.602 120.840,303.000 120.400 C 303.398 119.960,303.960 119.600,304.248 119.600 C 304.536 119.600,304.965 119.240,305.200 118.800 C 305.435 118.360,305.880 118.000,306.187 118.000 C 306.495 118.000,306.860 117.640,307.000 117.200 C 307.140 116.760,307.512 116.400,307.827 116.400 C 308.142 116.400,308.400 116.040,308.400 115.600 C 308.400 115.067,308.667 114.800,309.200 114.800 C 309.640 114.800,310.360 114.440,310.800 114.000 C 311.240 113.560,311.887 113.200,312.237 113.200 C 312.588 113.200,312.969 112.840,313.084 112.400 C 313.200 111.957,313.630 111.600,314.047 111.600 C 314.533 111.600,314.800 111.317,314.800 110.800 C 314.800 110.267,315.067 110.000,315.600 110.000 C 316.133 110.000,316.400 109.733,316.400 109.200 C 316.400 108.682,316.667 108.400,317.157 108.400 C 317.574 108.400,318.012 108.147,318.130 107.838 C 318.249 107.528,318.883 107.157,319.540 107.013 C 320.196 106.869,320.833 106.492,320.954 106.176 C 321.076 105.859,321.438 105.600,321.760 105.600 C 322.083 105.600,322.460 105.240,322.600 104.800 C 322.740 104.360,323.100 104.000,323.400 104.000 C 323.700 104.000,324.048 103.680,324.172 103.288 C 324.296 102.897,324.938 102.372,325.599 102.123 C 326.905 101.630,327.277 100.158,326.200 99.745 C 325.870 99.618,325.600 99.105,325.600 98.604 C 325.600 98.030,325.304 97.616,324.800 97.484 C 324.360 97.369,324.000 96.988,324.000 96.637 C 324.000 96.287,323.773 96.000,323.496 96.000 C 323.219 96.000,322.768 95.640,322.493 95.200 C 322.218 94.760,321.725 94.400,321.397 94.400 C 321.068 94.400,320.800 94.150,320.800 93.845 C 320.800 93.526,320.202 93.177,319.400 93.026 C 318.562 92.869,318.000 92.530,318.000 92.182 C 318.000 91.862,317.640 91.600,317.200 91.600 C 316.667 91.600,316.400 91.333,316.400 90.800 C 316.400 90.267,316.133 90.000,315.600 90.000 C 315.067 90.000,314.800 89.733,314.800 89.200 C 314.800 88.683,314.533 88.400,314.047 88.400 C 313.630 88.400,313.200 88.043,313.084 87.600 C 312.924 86.987,312.538 86.800,311.437 86.800 C 310.267 86.800,310.000 86.652,310.000 86.000 C 310.000 85.467,309.733 85.200,309.200 85.200 C 308.683 85.200,308.400 84.933,308.400 84.447 C 308.400 84.030,308.043 83.600,307.600 83.484 C 307.160 83.369,306.800 82.988,306.800 82.637 C 306.800 82.267,306.465 82.000,306.000 82.000 C 305.560 82.000,305.200 81.749,305.200 81.443 C 305.200 80.831,304.359 80.400,303.167 80.400 C 302.667 80.400,302.400 80.122,302.400 79.600 C 302.400 79.083,302.133 78.800,301.647 78.800 C 301.230 78.800,300.800 78.443,300.684 78.000 C 300.569 77.560,300.188 77.200,299.837 77.200 C 299.487 77.200,299.200 76.930,299.200 76.600 C 299.200 76.270,298.861 76.000,298.447 76.000 C 298.030 76.000,297.600 75.643,297.484 75.200 C 297.324 74.587,296.938 74.400,295.837 74.400 C 294.667 74.400,294.400 74.252,294.400 73.600 C 294.400 73.067,294.133 72.800,293.600 72.800 C 293.067 72.800,292.800 72.533,292.800 72.000 C 292.800 71.467,292.533 71.200,292.000 71.200 C 291.467 71.200,291.200 70.933,291.200 70.400 C 291.200 69.883,290.933 69.600,290.447 69.600 C 290.030 69.600,289.600 69.243,289.484 68.800 C 289.332 68.217,288.938 68.000,288.037 68.000 C 287.067 68.000,286.800 67.828,286.800 67.200 C 286.800 66.667,286.533 66.400,286.000 66.400 C 285.467 66.400,285.200 66.133,285.200 65.600 C 285.200 65.083,284.933 64.800,284.447 64.800 C 284.030 64.800,283.600 64.443,283.484 64.000 C 283.369 63.560,283.007 63.200,282.680 63.200 C 282.353 63.200,281.986 62.940,281.864 62.622 C 281.742 62.304,281.003 61.924,280.221 61.778 C 279.189 61.584,278.800 61.304,278.800 60.755 C 278.800 60.267,278.518 60.000,278.000 60.000 C 277.556 60.000,277.200 59.733,277.200 59.400 C 277.200 59.067,276.844 58.800,276.400 58.800 C 275.867 58.800,275.600 58.533,275.600 58.000 C 275.600 57.467,275.333 57.200,274.800 57.200 C 274.267 57.200,274.000 56.933,274.000 56.400 C 274.000 55.752,273.733 55.600,272.600 55.600 C 271.467 55.600,271.200 55.448,271.200 54.800 C 271.200 54.267,270.933 54.000,270.400 54.000 C 269.867 54.000,269.600 53.733,269.600 53.200 C 269.600 52.667,269.333 52.400,268.800 52.400 C 268.267 52.400,268.000 52.133,268.000 51.600 C 268.000 51.103,267.733 50.800,267.296 50.800 C 266.909 50.800,266.368 50.440,266.093 50.000 C 265.774 49.490,265.160 49.200,264.397 49.200 C 263.467 49.200,263.200 49.022,263.200 48.400 C 263.200 47.867,262.933 47.600,262.400 47.600 C 261.867 47.600,261.600 47.333,261.600 46.800 C 261.600 46.267,261.333 46.000,260.800 46.000 C 260.335 46.000,260.000 45.733,260.000 45.363 C 260.000 45.012,259.640 44.631,259.200 44.516 C 258.760 44.401,258.400 44.078,258.400 43.798 C 258.400 43.518,257.770 43.171,257.000 43.026 C 256.162 42.869,255.600 42.530,255.600 42.182 C 255.600 41.862,255.240 41.600,254.800 41.600 C 254.267 41.600,254.000 41.333,254.000 40.800 C 254.000 40.267,253.733 40.000,253.200 40.000 C 252.667 40.000,252.400 39.733,252.400 39.200 C 252.400 38.683,252.133 38.400,251.647 38.400 C 251.230 38.400,250.800 38.043,250.684 37.600 C 250.524 36.987,250.138 36.800,249.037 36.800 C 247.867 36.800,247.600 36.652,247.600 36.000 C 247.600 35.467,247.333 35.200,246.800 35.200 C 246.267 35.200,246.000 34.933,246.000 34.400 C 246.000 33.867,245.733 33.600,245.200 33.600 C 244.667 33.600,244.400 33.333,244.400 32.800 C 244.400 32.267,244.133 32.000,243.600 32.000 C 243.160 32.000,242.800 31.749,242.800 31.443 C 242.800 30.840,241.962 30.400,240.814 30.400 C 240.418 30.400,239.999 30.040,239.884 29.600 C 239.769 29.160,239.409 28.800,239.084 28.800 C 238.759 28.800,238.399 28.440,238.284 28.000 C 238.169 27.560,237.788 27.200,237.437 27.200 C 237.087 27.200,236.800 26.930,236.800 26.600 C 236.800 26.270,236.461 26.000,236.047 26.000 C 235.630 26.000,235.200 25.643,235.084 25.200 C 234.924 24.587,234.538 24.400,233.437 24.400 C 232.267 24.400,232.000 24.252,232.000 23.600 C 232.000 23.067,231.733 22.800,231.200 22.800 C 230.667 22.800,230.400 22.533,230.400 22.000 C 230.400 21.467,230.133 21.200,229.600 21.200 C 229.067 21.200,228.800 20.933,228.800 20.400 C 228.800 19.883,228.533 19.600,228.047 19.600 C 227.630 19.600,227.200 19.243,227.084 18.800 C 226.934 18.226,226.538 18.000,225.684 18.000 C 224.830 18.000,224.434 17.774,224.284 17.200 C 224.169 16.760,223.809 16.400,223.484 16.400 C 223.159 16.400,222.799 16.040,222.684 15.600 C 222.569 15.160,222.188 14.800,221.837 14.800 C 221.487 14.800,221.200 14.526,221.200 14.190 C 221.200 13.855,220.750 13.409,220.200 13.200 C 219.650 12.991,219.200 12.644,219.200 12.428 C 219.200 12.213,218.587 11.921,217.837 11.781 C 216.968 11.618,216.401 11.248,216.274 10.762 C 216.165 10.343,215.788 10.000,215.437 10.000 C 215.087 10.000,214.800 9.730,214.800 9.400 C 214.800 9.067,214.444 8.800,214.000 8.800 C 213.467 8.800,213.200 8.533,213.200 8.000 C 213.200 7.483,212.933 7.200,212.447 7.200 C 212.030 7.200,211.600 6.843,211.484 6.400 C 211.324 5.787,210.938 5.600,209.837 5.600 C 208.667 5.600,208.400 5.452,208.400 4.800 C 208.400 4.360,208.151 4.000,207.847 4.000 C 207.542 4.000,207.199 3.640,207.084 3.200 C 206.969 2.760,206.609 2.400,206.284 2.400 C 205.959 2.400,205.599 2.040,205.484 1.600 C 205.369 1.160,204.988 0.800,204.637 0.800 C 204.287 0.800,204.000 0.620,204.000 0.400 C 204.000 0.178,202.933 0.000,201.600 0.000 L 199.200 0.000 199.200 37.200 " stroke="none" fill="#000000" fill-rule="evenodd"></path></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="32"
+ height="32"
+ viewBox="0 0 8.4666665 8.4666669"
+ version="1.1"
+ id="svg1475"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ sodipodi:docname="turn-right.svg">
+ <defs
+ id="defs1469" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.8"
+ inkscape:cx="-73.484333"
+ inkscape:cy="9.3399563"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ units="px"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2020"
+ empspacing="4" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata1472">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-288.53332)">
+ <path
+ style="opacity:1;vector-effect:none;fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:0.79374999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 4.2333334,289.06248 2.1166666,1.5875 -2.1166666,1.5875 v -1.05833 a 2.1166664,2.1166664 0 0 0 -2.1166667,2.11667 2.1166664,2.1166664 0 0 0 2.1166667,2.11666 A 2.1166664,2.1166664 0 0 0 6.35,293.29582 h 1.0583333 a 3.175,3.175 0 0 1 -3.1749999,3.175 3.175,3.175 0 0 1 -3.175,-3.175 3.175,3.175 0 0 1 3.175,-3.175 z"
+ id="path2022"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/src/activities/programmingMaze/resource/tutorial1.png b/src/activities/programmingMaze/resource/tutorial1.png
index 76635de1b..0d095b21e 100644
Binary files a/src/activities/programmingMaze/resource/tutorial1.png and b/src/activities/programmingMaze/resource/tutorial1.png differ
diff --git a/src/activities/programmingMaze/resource/tutorial2.png b/src/activities/programmingMaze/resource/tutorial2.png
index f9dbaf827..144249dc7 100644
Binary files a/src/activities/programmingMaze/resource/tutorial2.png and b/src/activities/programmingMaze/resource/tutorial2.png differ
diff --git a/src/activities/programmingMaze/resource/tutorial3.png b/src/activities/programmingMaze/resource/tutorial3.png
index 94880472b..1f6a5cc36 100644
Binary files a/src/activities/programmingMaze/resource/tutorial3.png and b/src/activities/programmingMaze/resource/tutorial3.png differ
diff --git a/src/activities/railroad/railroad.js b/src/activities/railroad/railroad.js
index 203f663ca..88e787640 100644
--- a/src/activities/railroad/railroad.js
+++ b/src/activities/railroad/railroad.js
@@ -1,204 +1,204 @@
/* GCompris - railroad.js
*
* Copyright (C) 2016 Utkarsh Tiwari <iamutkarshtiwari@kde.org>
* Copyright (C) 2018 Amit Sagtani <asagtani06@gmail.com>
*
* Authors:
* <Pascal Georges> (GTK+ version)
* Utkarsh Tiwari <iamutkarshtiwari@kde.org> (Qt Quick port)
* Amit Sagtani <asagtani06@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris
var currentLevel = 0
var numberOfLevel = 10
var solutionArray = []
var backupListModel = []
var isNewLevel = true
var resourceURL = "qrc:/gcompris/src/activities/railroad/resource/"
var items
var uniqueId = []
/**
* Stores configuration for each level.
* 'WagonsInCorrectAnswers' contains no. of wagons in correct answer.
* 'memoryTime' contains time(in seconds) for memorizing the wagons.
* 'numberOfSubLevels' contains no. of sublevels in each level.
* 'columnsInHorizontalMode' contains no. of columns in a row of sampleZone in horizontal mode.
* 'columnsInVerticalMode' contains no. of columns in a row of sampleZone in vertical mode.
* 'noOfLocos' stores no. of locos to be displayed in sampleZone.
* 'noOfWagons' stores no. of wagons to be displayed in sampleZone.
*/
var dataset = {
"WagonsInCorrectAnswers": [1, 1, 2, 2, 3, 3, 4, 4, 5, 5],
"memoryTime": [4, 4, 6, 6, 7, 7, 8, 8, 10, 10],
"numberOfSubLevels": 3,
"columnsInHorizontalMode": [3, 5, 3, 5, 3, 5, 3, 5, 3, 5],
"columsInVerticalMode": [3, 4, 3, 4, 3, 4, 3, 4, 3, 4],
"noOfLocos": [8, 9, 4, 9, 4, 9, 4, 9, 4, 9],
"noOfWagons": [4, 11, 8, 11, 8, 11, 8, 11, 8, 11]
}
function start(items_) {
items = items_
currentLevel = 0
items.score.numberOfSubLevels = dataset["numberOfSubLevels"];
items.score.currentSubLevel = 1;
initLevel()
}
function stop() {
}
function initLevel() {
generateUniqueId();
items.mouseEnabled = true;
items.memoryMode = false;
items.trainAnimationTimer.stop();
items.animateFlow.stop(); // Stops any previous animations
items.listModel.clear();
items.answerZone.currentIndex = 0;
items.sampleList.currentIndex = 0;
items.answerZone.selectedSwapIndex = -1;
if(isNewLevel) {
// Initiates a new level
backupListModel = [];
solutionArray = [];
//Adds wagons to display in answerZone
var identifier;
var idLoco;
// Adds a loco at the beginning
idLoco = "loco" + Math.floor(Math.random() * dataset["noOfLocos"][currentLevel])
addWagon(idLoco, items.listModel.length);
for(var i = 0; i < dataset["WagonsInCorrectAnswers"][currentLevel] - 1; i++) {
do {
identifier = "wagon" + Math.floor(Math.random() * dataset["noOfWagons"][currentLevel])
} while (solutionArray.indexOf(identifier) != -1)
solutionArray.push(identifier);
addWagon(identifier, i);
}
solutionArray.push(idLoco);
} else {
// Re-setup the same level
for(var i = 0; i < solutionArray.length; i++) {
addWagon(solutionArray[i], i);
}
}
if(items.introMessage.visible === false && isNewLevel) {
items.trainAnimationTimer.start()
}
items.bar.level = currentLevel + 1;
items.trainAnimationTimer.interval = dataset["memoryTime"][currentLevel] * 1000
}
function nextLevel() {
if(numberOfLevel <= ++currentLevel) {
currentLevel = 0
}
items.score.currentSubLevel = 1;
isNewLevel = true;
initLevel();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
items.score.currentSubLevel = 1;
isNewLevel = true;
initLevel();
}
function restoreLevel() {
backupListModel = [];
for (var index = 0; index < items.listModel.count; index++) {
backupListModel.push(items.listModel.get(index).id);
}
isNewLevel = false;
initLevel();
}
function nextSubLevel() {
/* Sets up the next sublevel */
items.score.currentSubLevel ++;
if(items.score.currentSubLevel > dataset["numberOfSubLevels"]) {
nextLevel();
}
else {
isNewLevel = true;
initLevel();
}
}
function checkAnswer() {
/* Checks if the top level setup equals the solutions */
if(items.listModel.count === solutionArray.length) {
var isSolution = true;
for (var index = 0; index < items.listModel.count; index++) {
if(items.listModel.get(index).id !== solutionArray[index]) {
isSolution = false;
break;
}
}
if(isSolution == true) {
items.mouseEnabled = false; // Disables the touch
items.bonus.good("flower");
}
else {
- items.bonus.bad("flower");
+ items.bonus.bad("flower", items.bonus.checkAnswer);
}
}
else {
- items.bonus.bad("flower");
+ items.bonus.bad("flower", items.bonus.checkAnswer);
}
}
function addWagon(uniqueID, dropIndex) {
/* Appends wagons to the display area */
items.listModel.insert(dropIndex, {"id": uniqueID});
}
function getDropIndex(x) {
var count = items.listModel.count;
for (var index = 0; index < count; index++) {
var xVal = items.answerZone.cellWidth * index
var itemWidth = items.answerZone.cellWidth
if(x < xVal && index == 0) {
return 0;
}
else if((xVal + itemWidth + items.background.width * 0.0025) <= x && index == (count - 1)) {
return count;
}
else if(xVal <= x && x < (xVal + itemWidth + items.background.width * 0.0025)) {
return index + 1;
}
}
return 0;
}
function generateUniqueId() {
uniqueId = [];
var index;
for(index = 0; index < dataset["noOfLocos"][currentLevel]; index++) {
uniqueId.push("loco" + index)
}
for(index = 0; index < dataset["noOfWagons"][currentLevel]; index++) {
uniqueId.push("wagon" + index)
}
}
diff --git a/src/activities/readingh/Readingh.qml b/src/activities/readingh/Readingh.qml
index 7eb3640cd..e52f6da16 100644
--- a/src/activities/readingh/Readingh.qml
+++ b/src/activities/readingh/Readingh.qml
@@ -1,302 +1,334 @@
/* GCompris - readingh.qml
*
* Copyright (C) 2015 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Johnny Jazeix <jazeix@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "readingh.js" as Activity
import "qrc:/gcompris/src/core/core.js" as Core
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
+ property int speedSetting: 5
/* mode of the activity, "readingh" (horizontal) or "readingv" (vertical):*/
property string mode: "readingh"
pageComponent: Image {
id: background
anchors.fill: parent
source: Activity.url + "reading-bg.svg"
signal start
signal stop
sourceSize.width: parent.width
fillMode: Image.Stretch
Component.onCompleted: {
dialogActivityConfig.getInitialConfiguration()
activity.start.connect(start)
activity.stop.connect(stop)
}
// system locale by default
property string locale: "system"
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias wordlist: wordlist
property alias wordDropTimer: wordDropTimer
property alias locale: background.locale
property alias iAmReady: iAmReady
property alias answerButtonFound: answerButtonFound
property alias answerButtonNotFound: answerButtonNotFound
property alias answerButtonsFlow: answerButtonsFlow
property alias wordDisplayRepeater: wordDisplayRepeater
property string textToFind
property int currentIndex
property bool buttonsBlocked: false
}
onStart: { Activity.start(items, mode) }
onStop: { Activity.stop() }
DialogActivityConfig {
id: dialogActivityConfig
currentActivity: activity
content: Component {
Item {
property alias localeBox: localeBox
+ property alias speedSlider: speedSlider
height: column.height
property alias availableLangs: langs.languages
LanguageList {
id: langs
}
Column {
id: column
- spacing: 10
+ spacing: 10 * ApplicationInfo.ratio
width: parent.width
Flow {
spacing: 5
width: dialogActivityConfig.width
GCComboBox {
id: localeBox
model: langs.languages
background: dialogActivityConfig
width: dialogActivityConfig.width
label: qsTr("Select your locale")
}
}
+ GCText {
+ id: speedSliderText
+ text: qsTr("Speed")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ }
+ Flow {
+ width: dialogActivityConfig.width
+ spacing: 5
+ GCSlider {
+ id: speedSlider
+ width: 250 * ApplicationInfo.ratio
+ value: activity.speedSetting
+ maximumValue: 5
+ minimumValue: 1
+ scrollEnabled: false
+ }
+ }
}
}
}
onClose: home()
onLoadData: {
if(dataToSave) {
if(dataToSave["locale"]) {
background.locale = dataToSave["locale"];
}
}
+ if(dataToSave) {
+ if(dataToSave["speedSetting"]) {
+ activity.speedSetting = dataToSave["speedSetting"];
+ }
+ }
}
onSaveData: {
var oldLocale = background.locale;
var newLocale = dialogActivityConfig.configItem.availableLangs[dialogActivityConfig.loader.item.localeBox.currentIndex].locale;
// Remove .UTF-8
if(newLocale.indexOf('.') !== -1) {
newLocale = newLocale.substring(0, newLocale.indexOf('.'))
}
dataToSave = {
"locale": newLocale,
}
background.locale = newLocale;
// Restart the activity with new information
if(oldLocale !== newLocale) {
background.stop();
wordDisplayList.layoutDirection = Core.isLeftToRightLocale(background.locale) ? Qt.LeftToRight : Qt.RightToLeft;
background.start();
}
+ var oldSpeed = activity.speedSetting
+ activity.speedSetting = dialogActivityConfig.configItem.speedSlider.value
+ if(oldSpeed != activity.speedSetting) {
+ dataToSave = {"speedSetting": activity.speedSetting};
+ background.stop();
+ background.start();
+ }
}
function setDefaultValues() {
var localeUtf8 = background.locale;
if(background.locale != "system") {
localeUtf8 += ".UTF-8";
}
for(var i = 0 ; i < dialogActivityConfig.configItem.availableLangs.length ; i ++) {
if(dialogActivityConfig.configItem.availableLangs[i].locale === localeUtf8) {
dialogActivityConfig.loader.item.localeBox.currentIndex = i;
break;
}
}
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level | config }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onConfigClicked: {
dialogActivityConfig.active = true
dialogActivityConfig.setDefaultValues()
displayDialog(dialogActivityConfig)
}
}
Bonus {
id: bonus
// Do not pass automatically at next level, allowing the child to do more than one try, or add sublevels?
Component.onCompleted: {
win.connect(resetClickInProgress)
loose.connect(resetClickInProgress)
}
}
function resetClickInProgress() {
items.buttonsBlocked = false
Activity.initLevel()
}
Flow {
id: wordDisplayList
spacing: 20
x: 70/800*parent.width
y: 100/600*parent.height - 40 * ApplicationInfo.ratio
width: 350/800*parent.width-x
height: 520/600*parent.height-y - 40 * ApplicationInfo.ratio
flow: mode == "readingh" ? Flow.LeftToRight : Flow.TopToBottom
layoutDirection: Core.isLeftToRightLocale(locale) ? Qt.LeftToRight : Qt.RightToLeft
Repeater {
id: wordDisplayRepeater
model: Activity.words
property int idToHideBecauseOverflow: 0
delegate: GCText {
text: modelData
color: "#373737"
opacity: iAmReady.visible ? false : (index == items.currentIndex ? 1 : 0)
onOpacityChanged: {
/* Handle case where we go over the image
On these cases, we hide all above items to restart to 0
As we don't replay the same level and always replace the model,
we do not care about restoring visible to true */
if((x+width > wordDisplayList.width) ||
(y+height > wordDisplayList.height)) {
var i = wordDisplayRepeater.idToHideBecauseOverflow;
for(; i < index; ++i) {
wordDisplayRepeater.itemAt(i).visible=false
}
wordDisplayRepeater.idToHideBecauseOverflow = i
}
}
}
}
}
GCText {
id: wordToFindBox
x: 430/800*parent.width
y: 90/600*parent.height
text: qsTr("<font color=\"#373737\">Check if the word<br/></font><b><font color=\"#315AAA\">%1</font></b><br/><font color=\"#373737\">is displayed</font>").arg(items.textToFind)
color: "#373737"
horizontalAlignment: Text.AlignHCenter
width: background.width/3
height: background.height/5
fontSizeMode: Text.Fit
}
ReadyButton {
id: iAmReady
onClicked: Activity.run()
x: background.width / 2
y: background.height / 2.2
anchors.verticalCenter: undefined
anchors.horizontalCenter: undefined
theme: "light"
}
Flow {
id: answerButtonsFlow
x: iAmReady.x
y: iAmReady.y
width: wordToFindBox.width
AnswerButton {
id : answerButtonFound
width: Math.min(250 * ApplicationInfo.ratio, background.width/2-10)
height: 60 * ApplicationInfo.ratio
textLabel: qsTr("Yes, I saw it!")
isCorrectAnswer: Activity.words ? Activity.words.indexOf(items.textToFind) != -1 : false
onCorrectlyPressed: bonus.good("flower")
onIncorrectlyPressed: bonus.bad("flower")
blockAllButtonClicks: items.buttonsBlocked
onPressed: {
items.buttonsBlocked = true
}
}
AnswerButton {
id : answerButtonNotFound
width: Math.min(250 * ApplicationInfo.ratio, background.width/2-10)
height: 60 * ApplicationInfo.ratio
textLabel: qsTr("No, it was not there!")
isCorrectAnswer: !answerButtonFound.isCorrectAnswer
onCorrectlyPressed: bonus.good("flower")
onIncorrectlyPressed: bonus.bad("flower")
blockAllButtonClicks: items.buttonsBlocked
onPressed: {
items.buttonsBlocked = true
}
}
}
Wordlist {
id: wordlist
defaultFilename: Activity.dataSetUrl + "default-en.json"
// To switch between locales: xx_XX stored in configuration and
// possibly correct xx if available (ie fr_FR for french but dataset is fr.)
useDefault: false
filename: ""
onError: console.log("Reading: Wordlist error: " + msg);
}
Timer {
id: wordDropTimer
repeat: true
- interval: 1000
+ interval: items.currentIndex == -1 ? 100 : 5000 / speedSetting;
onTriggered: Activity.dropWord();
}
}
}
diff --git a/src/activities/reversecount/ActivityConfig.qml b/src/activities/reversecount/ActivityConfig.qml
index e44f7f33d..e1bb7160a 100644
--- a/src/activities/reversecount/ActivityConfig.qml
+++ b/src/activities/reversecount/ActivityConfig.qml
@@ -1,60 +1,61 @@
/* GCompris - ActivityConfig.qml
*
* Copyright (C) 2019 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "../../core"
Item {
id: activityConfiguration
property Item background
property alias modeBox: modeBox
+ width: if(background) background.width
property var availableModes: [
{ "text": qsTr("Dots"), "value": "dot" },
{ "text": qsTr("Arabic numbers"), "value": "number" },
{ "text": qsTr("Roman numbers"), "value": "roman" },
{ "text": qsTr("Images"), "value": "image" }
]
Flow {
id: flow
spacing: 5
width: parent.width
GCComboBox {
id: modeBox
model: availableModes
background: activityConfiguration.background
label: qsTr("Select Domino Representation")
}
}
property var dataToSave
function setDefaultValues() {
for(var i = 0 ; i < availableModes.length ; i++) {
if(availableModes[i].value === dataToSave["mode"]) {
modeBox.currentIndex = i;
break;
}
}
}
function saveValues() {
var newMode = availableModes[modeBox.currentIndex].value;
dataToSave = {"mode": newMode};
}
}
diff --git a/src/activities/reversecount/ActivityInfo.qml b/src/activities/reversecount/ActivityInfo.qml
index be0114db6..24cf69fff 100644
--- a/src/activities/reversecount/ActivityInfo.qml
+++ b/src/activities/reversecount/ActivityInfo.qml
@@ -1,41 +1,41 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "reversecount/Reversecount.qml"
difficulty: 2
icon: "reversecount/reversecount.svg"
author: "Emmanuel Charruau &lt;echarruau@gmail.com&gt;"
demo: false
//: Activity title
- title: qsTr("Practice subtraction with a fun game")
+ title: qsTr("Count intervals")
//: Help title
description: qsTr("Tux is hungry. Help him find fish by counting to the correct ice spot.")
// intro: "Click on the domino and validate your choice with the OK button to indicate the number of ice blocks Tux will have to follow to eat a fish."
//: Help goal
goal: qsTr("Tux is hungry. Help him find fish by counting to the correct ice spot.")
//: Help prerequisite
prerequisite: qsTr("Can read numbers on a domino, and count intervals up to 10 for the first level")
//: Help manual
manual: qsTr("Click on the domino to show how many ice spots there are between Tux and the fish. Click the domino with the right mouse button to count backwards. When done, click on the OK button or hit the Enter key.")
credit: ""
section: "math numeration"
createdInVersion: 0
levels: "1,2"
}
diff --git a/src/activities/reversecount/ChooseDiceBar.qml b/src/activities/reversecount/ChooseDiceBar.qml
index f9f4de542..914817fdb 100644
--- a/src/activities/reversecount/ChooseDiceBar.qml
+++ b/src/activities/reversecount/ChooseDiceBar.qml
@@ -1,66 +1,69 @@
/* GCompris - ChooseDiceBar.qml
*
* Copyright (C) 2014 Emmanuel Charruau <echarruau@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Emmanuel Charruau <echarruau@gmail.com> (Qt Quick port)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Major rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "reversecount.js" as Activity
Item {
id: chooseDiceBar
z: 1000
+ width: barRow.width
+ height: barRow.height
property alias value1: domino.value1
property alias value2: domino.value2
property alias valueMax: domino.valueMax
property alias mode: domino.mode
property GCSfx audioEffects
Row {
id: barRow
spacing: 8
+ anchors.centerIn: parent
BarButton {
id: ok
source: "qrc:/gcompris/src/core/resource/bar_ok.svg";
sourceSize.width: 75 * ApplicationInfo.ratio
visible: true
anchors {
right: undefined
rightMargin: undefined
top: undefined
topMargin: undefined
}
onClicked: Activity.moveTux()
}
Domino {
id: domino
height: ok.height
width: height * 2
isClickable: true
audioEffects: activity.audioEffects
}
}
}
diff --git a/src/activities/reversecount/Reversecount.qml b/src/activities/reversecount/Reversecount.qml
index 85b8e4a54..73c458e8b 100644
--- a/src/activities/reversecount/Reversecount.qml
+++ b/src/activities/reversecount/Reversecount.qml
@@ -1,262 +1,252 @@
/* GCompris - ReverseCount.qml
*
* Copyright (C) 2014 Emmanuel Charruau <echarruau@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Emmanuel Charruau <echarruau@gmail.com> (Qt Quick port)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Major rework)
+ * Timothée Giet <animtim@gcompris.net> (Layout and graphics rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "reversecount.js" as Activity
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
pageComponent: Rectangle {
id: background
anchors.fill: parent
- color: "#ff00a4b0"
+ color: "#ff1dade4"
signal start
signal stop
Component.onCompleted: {
dialogActivityConfig.initialize()
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property GCSfx audioEffects: activity.audioEffects
readonly property string resourceUrl: activity.resourceUrl
property var levels: activity.datasetLoader.data
property alias background: background
- property alias backgroundImg: backgroundImg
property alias bar: bar
property alias bonus: bonus
property alias chooseDiceBar: chooseDiceBar
property alias tux: tux
property alias fishToReach: fishToReach
property int clockPosition: 4
property string mode: "dot"
+ property var heightBase: (background.height - bar.height * 1.5) / 5
+ property var widthBase: background.width / 5
}
onStart: { Activity.start(items) }
onStop: { Activity.stop() }
Keys.onEnterPressed: Activity.moveTux()
Keys.onReturnPressed: Activity.moveTux()
onWidthChanged: {
- if(Activity.fishIndex > 0) {
- // set x
- fishToReach.x = Activity.iceBlocksLayout[Activity.fishIndex % Activity.iceBlocksLayout.length][0] *
- background.width / 5 + (background.width / 5 - tux.width) / 2
- // set y
- fishToReach.y = Activity.iceBlocksLayout[Activity.fishIndex % Activity.iceBlocksLayout.length][1] *
- (background.height - background.height/5) / 5 +
- (background.height / 5 - tux.height) / 2
- // Move Tux
- Activity.moveTuxToIceBlock()
- }
+ sizeChangedTimer.restart()
}
onHeightChanged: {
+ sizeChangedTimer.restart()
+ }
+
+ function replaceItems() {
if(Activity.fishIndex > 0) {
// set x
fishToReach.x = Activity.iceBlocksLayout[Activity.fishIndex % Activity.iceBlocksLayout.length][0] *
- background.width / 5 + (background.width / 5 - tux.width) / 2
+ items.widthBase + (items.widthBase - fishToReach.width) / 2
// set y
fishToReach.y = Activity.iceBlocksLayout[Activity.fishIndex % Activity.iceBlocksLayout.length][1] *
- (background.height - background.height/5) / 5 +
- (background.height / 5 - tux.height) / 2
+ items.heightBase + (items.heightBase - fishToReach.height) / 2
// Move Tux
Activity.moveTuxToIceBlock()
}
}
-
- Image {
- id: backgroundImg
- source: activity.resourceUrl + Activity.backgrounds[0]
- sourceSize.height: parent.height * 0.5
- anchors.horizontalCenter: parent.horizontalCenter
- anchors.verticalCenter: parent.verticalCenter
+
+ Timer {
+ id: sizeChangedTimer
+ interval: 100
+ onTriggered: replaceItems()
}
// === The ice blocks ===
Repeater {
model: Activity.iceBlocksLayout
Image {
- x: modelData[0] * background.width / 5
- y: modelData[1] * (background.height- background.height/5) / 5
- width: background.width / 5
- height: background.height / 5
- source: activity.resourceUrl + "iceblock.svg"
+ x: modelData[0] * items.widthBase
+ y: modelData[1] * items.heightBase
+ width: items.widthBase
+ height: items.heightBase
+ source: items.resourceUrl + "ice-block.svg"
}
}
-
Tux {
id: tux
- sourceSize.width: Math.min(background.width / 6, background.height / 6)
+ sourceSize.width: Math.min(items.widthBase, items.heightBase)
z: 11
}
Image {
id: fishToReach
- sourceSize.width: Math.min(background.width / 6, background.height / 6)
+ source: items.resourceUrl + "fish-blue.svg"
+ sourceSize.width: Math.min(items.widthBase, items.heightBase)
z: 10
- property string nextSource
property int nextX
property int nextY
function showParticles() {
particles.burst(40)
}
ParticleSystemStarLoader {
id: particles
clip: false
}
- onOpacityChanged: { if(opacity == 0) { source = ""; source = nextSource; } }
-
- onSourceChanged: {
- if(source != "") {
+ onOpacityChanged: {
+ if(opacity == 0) {
x = nextX
y = nextY
opacity = 1
}
}
Behavior on opacity { NumberAnimation { duration: 500 } }
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level | activityConfig }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onActivityConfigClicked: {
displayDialog(dialogActivityConfig)
}
}
Image {
id: clock
anchors {
right: parent.right
bottom: parent.bottom
margins: 10
}
sourceSize.width: 66 * bar.barZoom
property int remainingLife: items.clockPosition
onRemainingLifeChanged: if(remainingLife >= 0) clockAnim.restart()
SequentialAnimation {
id: clockAnim
alwaysRunToEnd: true
ParallelAnimation {
NumberAnimation {
target: clock; properties: "opacity";
to: 0; duration: 800; easing.type: Easing.OutCubic
}
NumberAnimation {
target: clock; properties: "rotation"; from: 0; to: 180;
duration: 800; easing.type: Easing.OutCubic
}
}
PropertyAction {
target: clock; property: 'source';
- value: activity.resourceUrl + "flower" + items.clockPosition + ".svg"
+ value: items.resourceUrl + "flower" + items.clockPosition + ".svg"
}
ParallelAnimation {
NumberAnimation {
target: clock; properties: "opacity";
to: 1; duration: 800; easing.type: Easing.OutCubic
}
NumberAnimation {
target: clock; properties: "rotation"; from: 180; to: 0;
duration: 800; easing.type: Easing.OutCubic
}
}
}
}
DialogChooseLevel {
id: dialogActivityConfig
currentActivity: activity.activityInfo
onClose: {
home()
}
onSaveData: {
levelFolder = dialogActivityConfig.chosenLevels
currentActivity.currentLevels = dialogActivityConfig.chosenLevels
ApplicationSettings.setCurrentLevels(currentActivity.name, dialogActivityConfig.chosenLevels)
// restart activity on saving
background.start()
}
onLoadData: {
if(activityData && activityData["mode"]) {
items.mode = activityData["mode"];
}
}
onStartActivity: {
background.start()
}
}
ChooseDiceBar {
id: chooseDiceBar
mode: items.mode
- x: background.width / 5 + 20
- y: (background.height - background.height/5) * 3 / 5
+ anchors.horizontalCenter: items.background.horizontalCenter
+ y: items.heightBase * 2
audioEffects: activity.audioEffects
}
Bonus {
id: bonus
winSound: "qrc:/gcompris/src/activities/ballcatch/resource/tuxok.wav"
looseSound: "qrc:/gcompris/src/activities/ballcatch/resource/youcannot.wav"
onWin: Activity.nextLevel()
onLoose: Activity.initLevel()
}
}
}
diff --git a/src/activities/reversecount/Tux.qml b/src/activities/reversecount/Tux.qml
index 9b356fe1b..166151c60 100644
--- a/src/activities/reversecount/Tux.qml
+++ b/src/activities/reversecount/Tux.qml
@@ -1,64 +1,64 @@
/* GCompris - Tux.qml
*
* Copyright (C) 2014 Emmanuel Charruau <echarruau@gmail.com>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Emmanuel Charruau <echarruau@gmail.com> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "reversecount.js" as Activity
import GCompris 1.0
Image {
id: tux
- source: activity.resourceUrl + "tux_top_south.svg"
+ source: "qrc:/gcompris/src/activities/maze/resource/tux_top_south.svg"
fillMode: Image.PreserveAspectFit
z: 10
property int duration: 1000
signal init
onInit: {
tux.rotation = -90
Activity.moveTuxToIceBlock()
}
Behavior on x {
SmoothedAnimation {
reversingMode: SmoothedAnimation.Immediate
onRunningChanged: Activity.tuxRunningChanged()
duration: tux.duration
}
}
Behavior on y {
SmoothedAnimation {
reversingMode: SmoothedAnimation.Immediate
onRunningChanged: Activity.tuxRunningChanged()
duration: tux.duration
}
}
Behavior on rotation {
RotationAnimation {
duration: tux.duration / 2
direction: RotationAnimation.Shortest
}
}
}
diff --git a/src/activities/reversecount/resource/Benzfish.svg b/src/activities/reversecount/resource/Benzfish.svg
deleted file mode 100644
index b961b20ac..000000000
--- a/src/activities/reversecount/resource/Benzfish.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xml:space="preserve"
- overflow="visible"
- enable-background="new 0 0 521.421 286.495"
- viewBox="0 0 521.50012 253.84421"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- width="100%"
- height="100%"
- sodipodi:docname="Benzfish.svg"
- style="overflow:visible"><defs
- id="defs47" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="797"
- inkscape:window-height="629"
- id="namedview45"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="0.81316249"
- inkscape:cx="279.16846"
- inkscape:cy="199.91375"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="Layer_1" /><switch
- id="switch4"
- transform="translate(18.457961,-89.317038)"><foreignObject
- y="0"
- x="0"
- height="1"
- width="1"
- requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
- id="foreignObject6" /><g
- id="g8"><g
- id="Layer_1"
- transform="translate(-18.446498,56.569259)"><path
- d="m 115.89,105 c 0,0 29.104,-65.14 42,-64.334 12.896,0.806 20,20.667 20,20.667 0,0 28.566,-29.881 42,-28 13.434,1.881 15.291,32.988 15.291,32.988 0,0 20.365,-14.42 29.5,-11.5 24.543,7.845 -16.791,59.679 -16.791,59.679 l -132,-9.5 z"
- id="path11"
- inkscape:connector-curvature="0"
- style="fill:#eb5f1f;stroke:#000000" /><path
- d="m 107.23,211.1 c 0,0 29.104,68.082 42,67.239 12.896,-0.842 20,-21.6 20,-21.6 0,0 28.566,31.229 42,29.264 13.434,-1.965 15.29,-34.478 15.29,-34.478 0,0 20.365,15.071 29.5,12.02 24.543,-8.199 -16.791,-62.374 -16.791,-62.374 l -132,9.93 z"
- id="path13"
- inkscape:connector-curvature="0"
- style="fill:#eb5f1f;stroke:#000000" /><path
- d="M 182.56,244 C 122.477,244.884 0,206.655 0.49,163.88 1.09,112.65 121.05,68.5 193.06,68.5 c 72.014,0 197.01,84.906 197.01,84.906 0,0 88,-91.45 119.99,-80.406 31.992,11.043 -26.99,110.41 -26.99,110.41 0,0 76.652,65.597 11.99,66.094 -64.66,0.497 -106.1,-39.86 -106.1,-39.86 0,0 -146.32,33.48 -206.4,34.36 z"
- id="path15"
- inkscape:connector-curvature="0"
- style="fill:#eb5f1f;stroke:#000000" /><path
- d="m 103.23,86.666 c -11.88,3.32 -11.357,11.928 -11.333,20.608 0.01,3.774 1.14,8.603 -0.014,12.255 -0.871,2.754 -3.346,4.715 -3.981,7.465 -0.801,3.469 0.188,7.26 -0.672,10.732 -1.514,6.121 -5.937,12.262 -7.333,18.638 -1.488,6.79 -2.241,12.313 -1.852,19.399 0.285,5.198 -1.963,9.422 -2.818,14.944 -0.78,5.039 -0.344,10.261 -0.647,15.185 -0.354,5.73 -3.196,11.905 5.483,14.356 6.589,1.861 16.783,-0.16 19.234,-5.021 -0.194,-0.822 -0.447,-0.744 -0.99,-1.336 2.341,-4.088 -1.469,-9.892 -1.742,-14.422 -0.322,-5.351 -0.502,-10.908 1.368,-16.012 1.02,-2.782 2.663,-4.774 4.5,-7.465 0.791,-1.156 1.089,-2.578 2.129,-3.737 1.427,-1.585 3.708,-2.447 4.934,-3.982 4.396,-5.504 3.349,-11.985 4.548,-18.06 1.187,-6.016 0.698,-12.39 2.553,-18.189 1.645,-5.142 4.349,-11.701 4.667,-16.986 0.456,-7.598 -7.057,-25.032 -17.368,-28.374"
- id="path17"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 94.932,131.12 c 0,7.959 -6.792,14.412 -15.17,14.412 -8.379,0 -15.17,-6.452 -15.17,-14.412 0,-7.96 6.792,-14.412 15.17,-14.412 8.379,0 15.17,6.45 15.17,14.41 z"
- id="path19"
- inkscape:connector-curvature="0"
- style="fill:#f9f9f9;stroke:#000000" /><path
- d="m 81.708,129.91 c 0,4.336 -3.557,7.851 -7.943,7.851 -4.387,0 -7.944,-3.515 -7.944,-7.851 0,-4.336 3.557,-7.852 7.944,-7.852 4.386,0 7.943,3.51 7.943,7.85 z"
- id="path21"
- inkscape:connector-curvature="0" /><path
- d="m 78.121,126.35 c 0,0.885 -0.803,1.602 -1.794,1.602 -0.991,0 -1.794,-0.717 -1.794,-1.602 0,-0.885 0.803,-1.602 1.794,-1.602 0.991,0 1.794,0.71 1.794,1.6 z"
- id="path23"
- inkscape:connector-curvature="0"
- style="fill:#ffffff" /><path
- d="m 50.055,108 c -8.701,2.272 -8.317,8.167 -8.3,14.11 0.008,2.584 0.835,5.89 -0.01,8.391 -0.638,1.886 -2.451,3.228 -2.915,5.111 -0.587,2.375 0.137,4.97 -0.493,7.348 -1.109,4.191 -4.348,8.396 -5.37,12.761 -1.089,4.649 -1.641,8.431 -1.356,13.282 0.209,3.558 -1.438,6.451 -2.063,10.231 -0.572,3.451 -0.252,7.025 -0.475,10.396 -0.259,3.924 -2.34,8.151 4.015,9.831 4.825,1.274 12.291,-0.11 14.085,-3.438 -0.142,-0.564 -0.327,-0.509 -0.724,-0.916 1.714,-2.798 -1.076,-6.771 -1.276,-9.873 -0.236,-3.664 -0.368,-7.47 1.002,-10.964 0.746,-1.904 1.95,-3.268 3.295,-5.11 0.579,-0.792 0.797,-1.766 1.56,-2.559 1.045,-1.087 2.715,-1.676 3.613,-2.728 3.219,-3.769 2.453,-8.206 3.331,-12.364 0.869,-4.12 0.511,-8.483 1.869,-12.454 1.205,-3.521 3.185,-8.012 3.417,-11.63 0.333,-5.203 -5.168,-17.139 -12.719,-19.427"
- id="path25"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 16.925,191.35 c 0,0 25,12 45.5,10 20.5,-2 38.5,-14.5 38.5,-14.5"
- id="path27"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:2" /><path
- d="m 167.23,70.667 c -11.88,4.193 -11.357,15.067 -11.333,26.032 0.01,4.767 1.14,10.866 -0.014,15.48 -0.871,3.479 -3.346,5.955 -3.981,9.43 -0.801,4.381 0.188,9.17 -0.672,13.556 -1.514,7.731 -5.937,15.489 -7.333,23.542 -1.488,8.579 -2.241,15.556 -1.852,24.507 0.285,6.564 -1.963,11.899 -2.818,18.875 -0.78,6.366 -0.344,12.961 -0.647,19.181 -0.354,7.238 -3.196,15.037 5.483,18.135 6.589,2.352 16.783,-0.202 19.234,-6.342 -0.194,-1.038 -0.447,-0.938 -0.99,-1.687 2.341,-5.165 -1.469,-12.494 -1.742,-18.217 -0.322,-6.76 -0.502,-13.78 1.368,-20.227 1.02,-3.514 2.663,-6.03 4.5,-9.428 0.791,-1.461 1.089,-3.259 2.129,-4.721 1.427,-2.005 3.708,-3.092 4.934,-5.032 4.396,-6.953 3.349,-15.138 4.548,-22.812 1.187,-7.599 0.698,-15.65 2.553,-22.976 1.645,-6.496 4.349,-14.781 4.667,-21.457 0.456,-9.598 -7.057,-31.619 -17.368,-35.841"
- id="path31"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 225.89,74 c -11.88,4.094 -11.357,14.711 -11.333,25.418 0.01,4.655 1.14,10.61 -0.014,15.115 -0.871,3.397 -3.346,5.815 -3.981,9.208 -0.801,4.279 0.188,8.954 -0.672,13.237 -1.514,7.549 -5.937,15.123 -7.333,22.987 -1.488,8.376 -2.241,15.188 -1.852,23.928 0.285,6.41 -1.963,11.619 -2.818,18.43 -0.78,6.216 -0.344,12.655 -0.647,18.728 -0.354,7.068 -3.196,14.685 5.483,17.707 6.589,2.297 16.783,-0.196 19.234,-6.191 -0.194,-1.013 -0.447,-0.917 -0.99,-1.647 2.341,-5.042 -1.469,-12.198 -1.742,-17.786 -0.322,-6.601 -0.502,-13.455 1.368,-19.749 1.02,-3.432 2.663,-5.89 4.5,-9.207 0.791,-1.427 1.089,-3.181 2.129,-4.609 1.427,-1.957 3.708,-3.018 4.934,-4.912 4.396,-6.789 3.349,-14.781 4.548,-22.274 1.187,-7.419 0.698,-15.281 2.553,-22.434 1.645,-6.342 4.349,-14.432 4.667,-20.951 0.456,-9.371 -7.057,-30.873 -17.368,-34.995"
- id="path33"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 293.23,100 c -11.88,3.236 -11.356,11.632 -11.332,20.097 0.01,3.68 1.14,8.389 -0.015,11.951 -0.87,2.686 -3.347,4.598 -3.981,7.28 -0.801,3.382 0.188,7.079 -0.672,10.466 -1.514,5.968 -5.937,11.957 -7.332,18.175 -1.488,6.623 -2.241,12.009 -1.852,18.919 0.285,5.067 -1.963,9.188 -2.818,14.573 -0.78,4.914 -0.344,10.006 -0.647,14.807 -0.354,5.588 -3.196,11.61 5.483,14 6.588,1.815 16.783,-0.155 19.234,-4.896 -0.194,-0.801 -0.447,-0.725 -0.99,-1.302 2.342,-3.987 -1.469,-9.646 -1.742,-14.063 -0.322,-5.219 -0.502,-10.639 1.368,-15.615 1.02,-2.713 2.663,-4.656 4.501,-7.278 0.79,-1.129 1.088,-2.516 2.129,-3.645 1.428,-1.549 3.707,-2.388 4.934,-3.886 4.396,-5.368 3.35,-11.687 4.549,-17.61 1.187,-5.866 0.697,-12.082 2.553,-17.738 1.645,-5.015 4.348,-11.411 4.666,-16.565 0.456,-7.409 -7.057,-24.41 -17.367,-27.669"
- id="path35"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 345.23,126.67 c -11.88,2.347 -11.356,8.434 -11.332,14.572 0.01,2.668 1.14,6.082 -0.015,8.666 -0.87,1.946 -3.347,3.333 -3.981,5.277 -0.801,2.454 0.188,5.133 -0.672,7.588 -1.514,4.328 -5.937,8.67 -7.332,13.179 -1.488,4.802 -2.241,8.706 -1.852,13.717 0.285,3.675 -1.963,6.662 -2.818,10.565 -0.78,3.563 -0.344,7.254 -0.647,10.737 -0.354,4.051 -3.196,8.416 5.483,10.15 6.588,1.316 16.783,-0.113 19.234,-3.55 -0.194,-0.581 -0.447,-0.526 -0.99,-0.945 2.342,-2.89 -1.469,-6.992 -1.742,-10.196 -0.322,-3.783 -0.502,-7.713 1.368,-11.321 1.02,-1.967 2.663,-3.376 4.501,-5.278 0.79,-0.817 1.088,-1.823 2.129,-2.641 1.428,-1.123 3.707,-1.732 4.934,-2.817 4.396,-3.893 3.35,-8.474 4.549,-12.769 1.187,-4.254 0.697,-8.761 2.553,-12.861 1.645,-3.636 4.348,-8.273 4.666,-12.01 0.456,-5.373 -7.057,-17.699 -17.367,-20.063"
- id="path37"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 388.71,152.02 c -6.936,2.204 -6.202,5.675 -5.762,9.21 0.189,1.538 1.101,3.424 0.591,4.996 -0.386,1.184 -1.771,2.16 -2.015,3.325 -0.309,1.472 0.467,2.945 0.124,4.422 -0.604,2.604 -2.947,5.422 -3.47,8.12 -0.557,2.875 -0.735,5.179 -0.156,8.039 0.424,2.097 -0.712,3.98 -0.953,6.29 -0.221,2.111 0.296,4.206 0.355,6.235 0.069,2.359 -1.327,5.08 3.978,5.456 4.027,0.286 10.02,-1.269 11.246,-3.425 -0.156,-0.319 -0.304,-0.27 -0.658,-0.474 1.2,-1.834 -1.36,-3.925 -1.745,-5.749 -0.455,-2.159 -0.833,-4.411 0.035,-6.625 0.473,-1.205 1.356,-2.135 2.322,-3.364 0.416,-0.527 0.524,-1.129 1.09,-1.676 0.776,-0.748 2.095,-1.263 2.753,-1.978 2.355,-2.559 1.415,-5.122 1.834,-7.684 0.415,-2.536 -0.189,-5.1 0.635,-7.595 0.732,-2.214 2.026,-5.081 1.957,-7.257 -0.099,-3.129 -5.439,-9.694 -11.763,-10.317"
- id="path39"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /><path
- d="m 459.29,94 c -12.716,3.533 -12.154,12.698 -12.129,21.939 0.01,4.016 1.219,9.157 -0.017,13.046 -0.932,2.932 -3.582,5.019 -4.262,7.946 -0.856,3.693 0.202,7.728 -0.719,11.426 -1.62,6.515 -6.354,13.051 -7.848,19.839 -1.593,7.231 -2.4,13.109 -1.982,20.654 0.306,5.531 -2.102,10.029 -3.017,15.907 -0.835,5.364 -0.369,10.924 -0.692,16.166 -0.379,6.098 -3.422,12.672 5.869,15.281 7.051,1.98 17.965,-0.171 20.588,-5.344 -0.207,-0.874 -0.477,-0.79 -1.059,-1.422 2.506,-4.353 -1.572,-10.529 -1.865,-15.353 -0.345,-5.697 -0.538,-11.614 1.465,-17.047 1.091,-2.96 2.851,-5.081 4.818,-7.945 0.846,-1.231 1.164,-2.746 2.278,-3.978 1.529,-1.689 3.968,-2.606 5.279,-4.241 4.706,-5.86 3.587,-12.758 4.869,-19.224 1.271,-6.406 0.747,-13.191 2.735,-19.365 1.759,-5.474 4.653,-12.457 4.993,-18.083 0.488,-8.089 -7.553,-26.648 -18.59,-30.206"
- id="path41"
- inkscape:connector-curvature="0"
- style="fill:#df7b53" /></g></g></switch><metadata
- id="metadata43"><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" /><dc:publisher><cc:Agent
- rdf:about="http://openclipart.org/"><dc:title>Openclipart</dc:title></cc:Agent></dc:publisher><dc:title>Cartoon fish</dc:title><dc:date>2010-06-06T10:54:03</dc:date><dc:description>benz fish ak student</dc:description><dc:source>http://openclipart.org/detail/64591/cartoon-fish-by-benz</dc:source><dc:creator><cc:Agent><dc:title>benz</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>benz fish ak student</rdf:li><rdf:li>clip art</rdf:li><rdf:li>clipart</rdf:li></rdf:Bag></dc:subject></cc:Work><cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/Fish02.svg b/src/activities/reversecount/resource/Fish02.svg
deleted file mode 100644
index 2d1c149a7..000000000
--- a/src/activities/reversecount/resource/Fish02.svg
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xml:space="preserve"
- viewBox="0 0 681.768 538.724"
- enable-background="new 0 0 681.768 538.724"
- overflow="visible"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="Fish02.svg"><defs
- id="defs154" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview152" /><switch
- id="switch4"><foreignObject
- y="0"
- x="0"
- requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
- width="1"
- height="1" /><g
- id="g6"><g
- id="Page_1"><g
- id="图层_1_85_"><g
- clip-rule="evenodd"
- fill-rule="evenodd"
- id="g10"><linearGradient
- id="XMLID_7_"
- x1="-11.062"
- gradientUnits="userSpaceOnUse"
- y1="720.29"
- gradientTransform="matrix(2.311 0 0 2.311 281.67 -1517.3)"
- x2="-1.508"
- y2="856.92"><stop
- stop-color="#FF4C00"
- offset=".01"
- id="stop13" /><stop
- stop-color="#FF4D00"
- offset=".3334"
- id="stop15" /><stop
- stop-color="#FEEE01"
- offset=".6176"
- id="stop17" /><stop
- stop-color="#FFF200"
- offset=".99"
- id="stop19" /></linearGradient><path
- d="m134.11 222.82c19.73-30.872 46.275-37.016 73.089-54.25 7.157-4.596 13.358-13.559 19.372-24.58 56.093 10.224 108.4 39.874 161.22 66.385l3.555 91.274c-4.399 2.71-8.523 5.699-11.859 9.476-8.813 9.981-6.335 18.911-6.861 30.982-2.27 51.977-32.446 89.384-65.821 124.78l-96.69-37.978-76-206.09z"
- fill="url(#XMLID_7_)"
- id="path21" /><linearGradient
- id="XMLID_8_"
- x1="-51.094"
- gradientUnits="userSpaceOnUse"
- y1="730.78"
- gradientTransform="matrix(2.311 0 0 2.311 217.86 -1466.5)"
- x2="-39.514"
- y2="840.95"><stop
- stop-color="#f20"
- offset=".03"
- id="stop24" /><stop
- stop-color="#FF6F03"
- offset=".3966"
- id="stop26" /><stop
- stop-color="#FDE909"
- offset=".6692"
- id="stop28" /><stop
- stop-color="#FFFB00"
- offset=".97"
- id="stop30" /></linearGradient><path
- d="m8.358 311.66c3.724-5.113 9.284-10.162 16.309-15.384 7.851-5.841 13.761-12.223 20.787-19.069 25.04-24.383 52.957-43.016 83.753-55.903 9.579-4.012 14.154-4.994 23.593 1.236 22.53 14.867 45.597 59.324 67.849 90.962 14.033 51.909-14.289 110.02-18.967 168.32-39.419-13.454-76.718-25.406-113.48-53.369-11.943-9.086-23.354-14.601-35.406-22.943-17.662-12.223-36.727-33.092-50.21-55.061-4.771-7.77-1.98-6.324 0.73-14.246 3.296-9.62-2.188-14.63 5.044-24.55z"
- fill="url(#XMLID_8_)"
- id="path32" /><linearGradient
- id="XMLID_9_"
- x1="-19.082"
- gradientUnits="userSpaceOnUse"
- y1="761.47"
- gradientTransform="matrix(2.311 0 0 2.311 322.32 -1552.9)"
- x2="29.962"
- y2="679.85"><stop
- stop-color="#C43400"
- offset=".04"
- id="stop35" /><stop
- stop-color="#ED4700"
- offset=".362"
- id="stop37" /><stop
- stop-color="#FEF600"
- offset=".6472"
- id="stop39" /><stop
- stop-color="#FFFB00"
- offset=".96"
- id="stop41" /></linearGradient><path
- d="m227.17 143.99c3.337-52.781 34.564-99.082 65.197-142.24 11.878-4.572 11.648 0.578 12.426 7.111-25.318 34.773-22.717 36.948-38.505 71.717 16.202-26.204 34.573-50.341 53.936-66.975-23.288 31.61-43.098 63.224-61.641 94.832 23.775-33.249 48.709-66.695 74.089-87.128-28.601 35.37-46.877 65.396-62.828 100.76 21.534-36.744 43.065-67.361 64.605-88.307-22.02 32.477-39.626 63.939-56.9 99.567 26.131-39.813 48.154-72.413 66.384-90.088-22.018 31.784-43.685 62.858-54.529 93.055 20.353-33.72 40.695-64.18 61.048-81.202-18.92 27.948-38.342 55.793-49.192 85.353 20.759-32.837 40.324-62.3 51.564-68.165-9.905 16.525-22.896 39.591-43.86 73.499 23.143-36.427 49.83-65.842 53.935-61.047-19.36 23.706-32.6 45.042-45.636 68.75 21.66-29.312 41.201-54.145 48.603-53.343-17.823 19.366-28.867 39.317-40.307 58.677 17.735-23.212 34.031-40.595 48.601-48.01-11.699 16.601-27.61 33.196-40.895 49.787 19.164-18.789 39.316-36.782 56.899-39.709-22.59 15.216-37.719 32.792-49.193 48.01 27.381-18.842 44.355-36.579 58.677-36.749-16.533 13.042-34.347 26.074-42.676 39.117 19.851-13.354 34.272-21.452 46.232-25.482-15.957 12.439-30.878 24.892-42.083 37.335 20.841-9.385 35.265-18.475 45.046-23.114-8.894 14.416-26.083 24.887-49.195 31.415 34.541 3.313 49.423-19.518 56.901-26.081-4.978 8.463-4.092 16.056-21.157 27.858-8.706 6.025-12.939 4.235-16.063 14.647-21.68-15.5-81.7-42.09-149.49-63.86z"
- fill="url(#XMLID_9_)"
- id="path43" /><path
- d="m11.27 346.78c17.154-8.577 34.126 6.148 49.136 13.653 8.575 4.287 12.864 18.227 20.369 21.441 16.082 7.505 55.748 5.361 73.974 5.361 16.082 0 35.38 4.288 50.388 4.288 21.442 0 2.146 3.217-7.504 12.864-22.513 22.514-5.667 21.591 4.289 41.813 24.353 49.468-78.439-9.172-90.056-15.194-17.845-9.25-100.24-58.15-100.6-84.22z"
- fill="#FFF642"
- id="path45" /><linearGradient
- id="XMLID_10_"
- x1="-13.403"
- gradientUnits="userSpaceOnUse"
- y1="760.78"
- gradientTransform="matrix(2.311 0 0 2.311 395.17 -1520.1)"
- x2="131.55"
- y2="786.34"><stop
- stop-color="#C41C02"
- offset=".08"
- id="stop48" /><stop
- stop-color="#FFF200"
- offset=".92"
- id="stop50" /></linearGradient><path
- d="m377.59 208.33c25.439-20.458 57.406-39.029 91.563-59.281 29.015-17.202 58.42-33.463 85.764-53.216 62.59-45.209 113.06-78.98 126.86-70.384-27.61 12.844-48.651 25.687-65.197 38.524 17.779-8.493 34.774-12.251 50.972-11.261-10.174 5.629-19.854 11.759-28.448 18.965 13.336-5.822 26.177-9.186 37.935-7.111-18.334 13.592-36.93 26.796-51.903 45.428-7.352 9.149-10 13.812-20.039 20.002-21.51 13.26-40.807 28.274-47.799 49.777-2.715 8.34-2.489 7.723-11.527 10.95-11.072 3.96-29.839 9.84-50.1 16.088 24.64-3.53 49.572-13.089 58.086-7.111-20.258 2.46-34.485 9.381-46.825 16.597 14.423-2.276 28.843-6.624 43.269-8.893 0.591 3.557-16.597 11.261-44.453 14.82 12.05 1.576 24.892 1.576 38.526 0-8.271 2.765-3.479 5.527-64.013 8.294 11.852 4.94 30.027 5.927 54.529 2.966-18.575 7.698-19.761 14.611-3.557 20.745l-71.122-2.372c5.783 7.434 24.055 9.418 48.851 9.139 9.047-0.101 12.443-2.682 10.733 7.973-0.428 2.677-1.291 5.353-2.876 8.03-3.973 6.708-6.703 5.988-14.028 5.373-13.957-1.175-29.082-5.449-45.052-11.546 1.48 7.387 11.195 13.838 41.302 17.672 14.353 1.822 12.063 0.979 11.02 15.572-1.449 20.306-14.543 11.716-27.428 4.684 3.85 11.064 17.479 25.684 35.561 36.752 3.286 15.793 9.885 18.428 18.967 27.263l-20.15-13.03 22.522 30.822-22.52-18.97 32.004 60.456-32-50.97 28.449 64.015-29.636-55.714 11.855 35.56c-5.927-11.271-11.859-21.556-17.782-24.892 0.802 28.283 7.854 56.571 18.069 84.864 2.376 6.58 2.72 10.447 3.518 17.223 1.429 12.197 7.093 24.401 11.604 36.602-10.96-13.744-17.676-25.555-29.535-59.234-10.837-30.761-33.021-57.254-49.886-86.569-32.116-24.806-56.901-54.529-74.682-88.906-13.23-33.24-13.25-64.59-11.38-95.68z"
- fill="url(#XMLID_10_)"
- id="path52" /><path
- d="m404.38 203.26c20.367-12.286 42.808-21.49 66.057-36.509 8.922-5.765 17.971-10.257 28.228-14.099 36.425-13.653 56.995-34.233 77.237-45.714 4.547-2.58 9.125-4.907 13.594-7.658 16.138-9.941 26.079-17.559 33-24.045-3.821 7.165-6.146 13.811-32.364 28.877-3.842 2.208-6.645 4.187-9.994 7.067-14.824 12.768-35.195 26.232-62.887 40.605-12.514 6.495-26.161 11.091-38.343 17.799-20.87 11.49-48.84 35.71-74.54 33.68z"
- fill="#FFE500"
- id="path54" /><path
- d="m528 171.65c25.252-8.493 47.655-24.582 69.607-41.889 14.905-10.191 22.956-18.676 31.412-27.265-8.331 2.995-18.21 7.4-28.934 14.643-4.312 2.915-8.008 6.14-11.903 9.572-16.13 14.184-34.258 27.913-62.631 39.269-8.956 3.582-17.905 5.875-27.072 8.688-39.847 12.229-72.404 35.736-91.894 53.303-9.858 8.883 64.521-34.537 96.849-48.787 8.11-3.58 16.22-4.73 24.55-7.53z"
- fill="#FFF200"
- id="path56" /><path
- d="m428.09 226.37c6.156 3.239 25.73-2.634 60.913-23.973 6.79-4.116 9.644-4.278 17.415-5.472 9.906-1.529 19.104-4.473 28.356-7.306-7.501-0.847-16.595-1.554-33.217 1.47-8.102 1.474-12.161 3.487-19.092 7.803-20.87 13.01-39.99 23.56-54.38 27.48z"
- fill="#fa0"
- id="path58" /><path
- d="m425.13 235.85c27.646 11.29 43.892 12.546 60.453 7.708-17.521-1.048-42.911-7.817-59.058-11.763-3.53-0.87 1.94 5.19-1.39 4.05z"
- fill="#fa0"
- id="path60" /><path
- d="m417.42 247.12c33.055 2.749 44.487 13.421 52.159 22.524-1.167 3.52-4.217 1.908-8.864-3.934-8.43-10.6-26.44-14.04-43.3-18.59z"
- fill="#fa0"
- id="path62" /><path
- d="m418.61 260.16c11.753 2.124 31.903 18.227 46.821 40.897v4.148c-14.88-15.76-30.36-30.9-46.82-45.05z"
- fill="#fa0"
- id="path64" /><path
- d="m427.5 282.08c21.701 31.624 49.213 63.209 78.828 94.831l0.594 4.744c-33.068-27.28-60.982-60.842-82.979-96.019l3.56-3.55z"
- fill="#fa0"
- id="path66" /><path
- d="m410.31 289.79c23.125 39.039 55.696 71.791 93.054 101.35l1.188 5.334c-58.804-42.04-82.709-73.765-98.982-104.32l4.74-2.36z"
- fill="#fa0"
- id="path68" /><path
- d="m399.05 311.13c18.924 30.314 39.283 51.766 68.47 77.358 9.31 17.772 20.224 34.263 33.478 48.884l-3.56 2.374c-13.719-15.464-23.376-32.42-32.296-49.484-28.426-23.352-51.075-45.515-68.459-76.754l2.37-2.38z"
- fill="#FFC800"
- id="path70" /><linearGradient
- id="XMLID_11_"
- x1="3.0029"
- gradientUnits="userSpaceOnUse"
- y1="747.81"
- gradientTransform="matrix(2.311 0 0 2.311 296.35 -1499.3)"
- x2="-25.273"
- y2="880.84"><stop
- stop-color="#E31E00"
- offset=".06"
- id="stop73" /><stop
- stop-color="#E52F00"
- offset=".3064"
- id="stop75" /><stop
- stop-color="#fe0"
- offset=".94"
- id="stop77" /></linearGradient><path
- d="m164.93 249.49c14.62-25.521 47.149 7.955 62.828 29.634 36.25 18.471 45.532 45.931 15.409 86.536-15.843 18.164-28.513 37.124-18.965 61.641 49.47 18.192 68.402 28.062 82.978 36.745 22.796-28.27 45.328-55.236 66.327-74.503 15.384-14.118 21.517-12.745 42.169-7.722 41.778 10.155 29.242 32.777 5.16 48.995-18.858 12.7-48.683 25.611-106.54 34.415 17.581 26.865 19.951 46.622 15.408 64.013-3.161-9.882-11.066-18.97-23.707-27.264 3.961 6.916 8.901 15.41 6.52 20.746-1.384-6.128-5.14-12.253-11.261-18.379 1.578 7.116 1.578 13.437 0 18.97-6.107-12.251-19.158-24.503-33.192-36.749 7.153 8.969 11.169 17.742 12.448 27.265l-19.56-20.153c9.7 11.669 17.614 22.343 13.038 26.08-2.767-6.718-10.276-12.645-22.523-17.779l11.261 18.372c-9.138-4.351-16.35-11.261-20.744-21.932l-1.186 15.412c-7.323-5.528-10.48-13.829-13.038-22.523l-2.963 17.782c-3.368-7.307-3.959-16.005-4.15-24.892l-10.668 13.629c-11.28-13.487-9.313-28.771-6.593-44.675 1.528-8.94-2.049-11.04-9.338-17.111-35.264-29.384 11.856-19.644 26.6-62.088 4.544-26.458 4.23-52.756-84.164-43.859-8.709-19.293-16.297-38.03-18.118-53.885-3.46-29.99 22.52-28.51 46.55-26.73z"
- fill="url(#XMLID_11_)"
- id="path79" /><path
- d="m105.07 277.94c17.348 0 31.412 18.044 31.412 40.306 0 22.259-14.063 40.3-31.412 40.3-17.35 0-31.413-18.041-31.413-40.3 0.003-22.27 14.067-40.31 31.413-40.31z"
- fill="#FFCF4C"
- id="path81" /><ellipse
- cy="312.31"
- cx="105.07"
- rx="31.412"
- ry="34.376"
- fill="#731A01"
- id="ellipse83" /><ellipse
- cy="313.5"
- cx="105.07"
- rx="17.187"
- ry="18.809"
- fill="#fff"
- id="ellipse85" /><path
- d="m9.492 309.45c5.004 0 9.063 7.852 9.063 17.547 0 9.685-4.059 17.536-9.063 17.536s-9.061-7.852-9.061-17.536c0-9.69 4.057-17.55 9.061-17.55z"
- fill="#FFE263"
- id="path87" /><ellipse
- cy="316.38"
- cx="105.07"
- rx="17.187"
- ry="15.924"
- id="ellipse89" /><path
- d="m7.777 320.38c4.057 0 7.348 6.249 7.348 13.963 0 7.708-3.291 13.957-7.348 13.957s-7.346-6.249-7.346-13.957c0-7.71 3.289-13.96 7.346-13.96z"
- fill="#913800"
- id="path91" /><path
- d="m47.967 288.19c25.621-25.423 54.298-45.509 85.136-61.807 4.684-2.472 4.633-1.853 3.975-7.12-34.85 12.521-69.51 33.352-98.388 65.197-1.143 9.11 4.984 7.98 9.275 3.73z"
- fill="#FFBC36"
- id="path93" /><path
- d="m192.92 183.29c-14.663 8.305-27.375 17.169-35.814 27.255-4.38 5.232-7.582 9.703-9.358-1.659 7.672-10.767 24.56-21.242 45.634-32.005 4.51 4.19 4.9 3.38-0.46 6.41z"
- fill="#FFBC36"
- id="path95" /><g
- fill="#F7FF00"
- id="g97"><path
- d="m305.64 251.72c8.215 5.06 5.42 12.112 4.424 25.068l0.492 1.966c4.096-13.272 6.552-21.792-2.458-28.508l-2.45 1.47z"
- id="path99" /><path
- d="m314.49 282.41c8.215 5.621 6.895 17.825 5.898 32.221l4.424-2.73c4.096-14.744 3.604-24.214-5.406-31.676l-4.91 2.19z"
- id="path101" /><path
- d="m325.3 277c5.455 4.703 5.64 17.407 5.897 32.223 2.786 1.71 4.261 0.8 4.425-2.73 1.474-14.092 0.979-23.557-5.408-31.675-2.94-0.58-4.58 0.15-4.91 2.18z"
- id="path103" /><path
- d="m334.64 274.54c8.932 5.624 12.563 20.283 11.306 34.681l3.933-1.255c3.439-19.334-1.969-32.735-10.322-35.609l-4.92 2.19z"
- id="path105" /><path
- d="m335.13 322.26c8.214 4.722 6.894 14.972 5.897 27.061 2.462 1.54 4.595 2.309 4.424-2.292 4.097-12.384 3.604-20.336-5.405-26.604-3.6-2.45-5.24-1.84-4.91 1.83z"
- id="path107" /><path
- d="m344.47 314.4c8.215 4.722 6.895 14.972 5.897 27.061 2.463 1.538 4.593 2.309 4.425-2.294 4.096-12.382 3.604-20.334-5.408-26.601-3.61-2.46-5.25-1.84-4.92 1.83z"
- id="path109" /><path
- d="m351.84 304.04c8.93 5.621 12.563 20.281 11.304 34.681l3.934-1.255c3.44-19.336-1.97-32.735-10.321-35.609l-4.91 2.19z"
- id="path111" /><ellipse
- cy="302.84"
- cx="294.58"
- rx="3.686"
- ry="9.339"
- id="ellipse113" /><path
- d="m294.83 276.78c-0.984-0.492-3.442-1.966-3.933-2.95 0 0-0.492-1.474-0.492-1.966 0-0.49-0.491-1.474-0.491-1.966v-1.474c0-0.982-0.492-1.474-0.492-1.966s0-1.966 0-2.458 0.492-0.982 0.492-1.966v-0.982c0-0.492 0.491-0.984 0.491-1.476l0.982-0.982 0.492-0.984v-0.982c0.492 0 1.474 0.982 1.966 0.982 0 0 1.476 0.492 1.476 0.984l0.49 1.474 0.492 0.492v1.474l0.492 0.492v1.966l0.492 0.982 0.489 0.492v4.916c0 0.492 0.492 0.982 0.492 1.474s0 0.984 0 1.474v0.492l-0.492 0.492-0.981 0.982c-0.99 0.06-2.47 1.04-1.97 1.04z"
- id="path115" /><path
- d="m279.59 277.28c-0.983-0.636-3.441-2.54-3.933-3.813 0 0-0.491-1.905-0.491-2.54 0-0.634-0.491-1.907-0.491-2.542v-1.907c0-1.269-0.492-1.905-0.492-2.54v-3.178c0-0.635 0.492-1.269 0.492-2.542v-1.269c0-0.635 0.491-1.271 0.491-1.908l0.982-1.269 0.492-1.271v-1.271c0.491 0 1.474 1.271 1.966 1.271 0 0 1.476 0.635 1.476 1.271l0.49 1.906 0.492 0.636v1.904l0.491 0.636v2.542l0.492 1.269 0.491 0.637v6.354c0 0.637 0.491 1.271 0.491 1.906v2.542l-0.491 0.636-0.983 1.269c-0.99-0.05-2.46 1.23-1.97 1.23z"
- id="path117" /></g><linearGradient
- id="XMLID_12_"
- x1="48.478"
- gradientUnits="userSpaceOnUse"
- y1="677.81"
- gradientTransform="matrix(.906 0 0 .906 299.01 -167.4)"
- x2="121.79"
- y2="622.57"><stop
- stop-color="#FF3700"
- offset=".05"
- id="stop120" /><stop
- stop-color="#FF4500"
- offset=".131"
- id="stop122" /><stop
- stop-color="#FCEE00"
- offset=".527"
- id="stop124" /><stop
- offset=".95"
- id="stop126" /></linearGradient><path
- d="m301.12 465.28c24.685-24.291 44.119-49.591 68.101-82.606 10.576-14.56 23.479-10.078 41.339-4.797 110.03 32.54-57.11 89.89-109.44 87.41z"
- fill="url(#XMLID_12_)"
- id="path128" /><g
- fill="#DB6E00"
- id="g130"><path
- d="m345.27 421.71c19.748-11.77 37.061-25.971 54.026-40.521-4.516-1.087-42.651 34.197-55.066 38.961l1.04 1.56z"
- id="path132" /><path
- d="m347.96 427.94c21.52-12.824 40.386-28.301 58.875-44.157-4.922-1.184-46.48 37.266-60.009 42.458l1.13 1.7z"
- id="path134" /><path
- d="m346.49 435.88c23.186-10.886 43.514-24.986 63.435-39.552-5.304-1.947-50.079 33.815-64.654 37.564l1.22 1.99z"
- id="path136" /><path
- d="m354.93 451.56c25.617-10.101 48.078-23.994 70.087-38.43-5.858-2.592-55.33 33.202-71.436 36.136l1.35 2.29z"
- id="path138" /></g><path
- d="m351.5 436.25c19.748-11.77 37.062-25.97 54.027-40.521-4.517-1.086-42.651 34.197-55.066 38.961l1.04 1.56z"
- fill="#DB6E00"
- id="path140" /><path
- d="m354.2 442.49c21.52-12.825 40.386-28.301 58.875-44.158-4.922-1.183-46.48 37.266-60.009 42.458l1.13 1.7z"
- fill="#DB6E00"
- id="path142" /><path
- d="m352.73 450.42c23.186-10.886 43.514-24.986 63.434-39.552-5.303-1.945-50.078 33.815-64.654 37.565l1.22 1.98z"
- fill="#DB6E00"
- id="path144" /><path
- d="m367.92 453.12c25.617-10.104 48.078-23.994 70.087-38.433-5.859-2.592-55.331 33.202-71.434 36.136l1.34 2.29z"
- fill="#DB6E00"
- id="path146" /><path
- d="m7.113 348.56c15.367 14.379 32.653 28.873 47.059 44.154 10.565 11.205 21.13 12.807 32.653 19.271 27.852 15.135 49.031 41.232 79.713 52.856 32.704 12.393-29.52-3.278-30.479-3.338-11.313-0.687-42.627-28.823-61.972-41.521-2.332-1.529-19.948-15.316-22.796-15.919-11.832-2.492-29.48-30.867-46.473-45.611-6.512-5.65 5.595-5.79 2.294-9.89z"
- fill="#FBFFC7"
- id="path148" /></g></g></g></g></switch><metadata
- id="metadata150"><rdf:RDF><cc:Work><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" /><dc:publisher><cc:Agent
- rdf:about="http://openclipart.org/"><dc:title>Openclipart</dc:title></cc:Agent></dc:publisher><dc:title>Fish icons</dc:title><dc:date>2013-08-02T15:38:58</dc:date><dc:description>free Fish icons</dc:description><dc:source>http://openclipart.org/detail/181437/fish-icons-by-vectorsme-181437</dc:source><dc:creator><cc:Agent><dc:title>vectorsme</dc:title></cc:Agent></dc:creator><dc:subject><rdf:Bag><rdf:li>free Fish icons</rdf:li></rdf:Bag></dc:subject></cc:Work><cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/README b/src/activities/reversecount/resource/README
index d68a7f9dc..b8601e973 100644
--- a/src/activities/reversecount/resource/README
+++ b/src/activities/reversecount/resource/README
@@ -1,36 +1,9 @@
icy_walk.wav: https://www.freesound.org/people/Corsica_S/sounds/28662/
This work is licensed under the Attribution License.
-Copyright: Timothée Giet, 2016
+Copyright: Timothée Giet, 2016 - 2019
License: CC-BY-SA 4.0
Files:
+fish-blue.svg
flower*.svg
-
-Copyright: Various - openclipart
-License: Public domain
-Files:
-baleine.svg
-Benzfish.svg
-blue-fish.svg
-drunken_duck_cartoon_globefish_kugelfisch.svg
-elephant_mer.svg
-epaulard.svg
-Fish02.svg
-flower0.svg
-flower1.svg
-flower2.svg
-flower3.svg
-flower4.svg
-flower5.svg
-flower6.svg
-iceblock.svg
-icy_walk.wav
-molumen_Codfish.svg
-morse.svg
-mystica_Aquarium_fish_-_Amphiprion_percula.svg
-narval.svg
-ourspolaire.svg
-pepinux_Pez_dorado.svg
-phoque.svg
-The_Whale-Fish.svg
-tux_top_south.svg
+ice-block.svg
diff --git a/src/activities/reversecount/resource/The_Whale-Fish.svg b/src/activities/reversecount/resource/The_Whale-Fish.svg
deleted file mode 100644
index aa915e97c..000000000
--- a/src/activities/reversecount/resource/The_Whale-Fish.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- viewBox="0 0 900 441.53"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="The_Whale-Fish.svg">
- <defs
- id="defs17" />
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview15" />
- <g
- id="layer1"
- transform="translate(829.27 -396.68)">
- <g
- id="g3796"
- transform="matrix(.75103 0 0 .75103 -206.46 208.69)">
- <path
- id="path2880"
- d="m-579.81 250.31c-0.23801 124.86-49.762 107.41-41.438 234.34-100.44-19.229-137.42 83.322-197.97 65.656-3.7129-1.0832-17.252 1.7913-5.0625 9.0938 102.8 61.589 209.25 25.389 249.5 13.125 8.7804 26.862 256.42 214.19 466.69 229.31 23.268 1.6729 46.577 2.7603 69.656 3.1875 0.66388 7.9486 0.08159 18.518-2.4688 33.188l30.125-33c184.45-1.1527 347.31-51.841 350.19-214.06 4.604-0.41031 9.1563 1.0018 12.625 1.0875 5.9098 0.14605 9.4076-0.68288 12.125-6.5938 7.4182-16.136 9.2472-59.794-14.656-65.125-0.90281-10.386-6.9893-60.607-35.344-56.062-4.5941 0.73627-8.6946 2.1959-12.625 3.9062-1.3472-2.0576-2.7458-4.0956-4.1562-6.125 9.5382-12.279 16.819-29.765 19.625-49.594 5.6642-40.029-9.0585-74.496-32.906-77-11.603-1.2184-23.223 5.3784-32.75 17.062-8.5394-15.708-20.997-25.656-34.906-25.656-15.934 0-30.001 13.014-38.406 32.844-73.555-38.579-163.91-55.607-252.72-38.688-25.999 4.953-49.171 12.572-70.094 22.062-42.516-34.241-111.12-73.869-208.78-80.844 24.654 25.562 25.333 44.967-2.5312 57.062 14.831 3.2496 29.402 55.253-14.125 58.094 31.46 36.462 0.88605 58.464-14.656 60.594 26.599 20.996 18.367 54.091-11.094 59.094 19.898 16.991 14.872 31.611 11.719 46.406-33.701 13.12-73.354 7.7133-128.91-30.75 26.563-101.49-19.496-182.2-66.656-262.62z" />
- <path
- id="path3722"
- fill="#9dbbbf"
- d="m56.062 293.88c40.044-20.709 59.143 8.6377 71.531 43.969 2.8276 1.0096 5.6426 2.0554 8.4375 3.125-12.61-47.76-44.439-75.75-79.968-47.09z" />
- <path
- id="path3699"
- d="m216.44 332.62c-23.85 0-43.188 31.445-43.188 70.219 0 38.773 19.338 70.188 43.188 70.188s43.156-31.414 43.156-70.188c0-38.773-19.306-70.219-43.156-70.219zm64.75 8.9688c-9.84-0.19-19.57 5.6-27.69 15.41 5.9531 12.731 9.5 28.614 9.5 45.844 0 24.262-7.0026 45.827-17.906 59.688 5.1497 6.8758 11.739 11.233 19.344 12.031 21.855 2.2951 43.778-25.592 48.969-62.281 5.1908-36.689-8.3326-68.267-30.188-70.562-0.68297-0.0717-1.3487-0.11156-2.0312-0.125zm-55.41 28.03c11.158 0 20.188 14.665 20.188 32.719s-9.0297 32.688-20.188 32.688-20.219-14.634-20.219-32.688 9.0609-32.719 20.219-32.719zm59.094 7.6875c8.3684 0 15.125 11.765 15.125 26.281 0 14.517-6.7566 26.281-15.125 26.281s-15.156-11.765-15.156-26.281c0-14.517 6.7879-26.281 15.156-26.281z"
- fill="#9dbbbf" />
- <path
- id="path3712"
- d="m177.16 373.62c-2.5086 8.8972-3.9062 18.791-3.9062 29.219 0 6.3645 0.52366 12.513 1.5 18.375l59.59-15.83s-41.051-22.358-57.188-31.75zm85.125 16.094c0.45792 4.2658 0.71875 8.646 0.71875 13.125 0 3.6204-0.16711 7.1716-0.46875 10.656l29.406-7.625s-14.344-7.8138-29.656-16.156z"
- fill="#f9f9f9" />
- <path
- id="path2882"
- d="m-577.31 263.94s-0.0219 36.56-3.75 59.469c28.087 46.562 41.734 86.472 48.406 118.66 6.1873 29.843 6.3749 52.993 6.5938 68.5 2.2494 0.0199 4.5298 0.1317 6.8438 0.34375 0 0 11.823-55.031 8.5938-87.375-5.7276-57.371-66.688-159.59-66.688-159.59zm-5.1875 66.781c-3.2303 13.412-9.8444 25.784-16 38.281 32.478 46.271 55.94 95.943 59.969 142.56 2.427-0.41166 4.918-0.69737 7.4688-0.84375-0.23207-15.613-0.39636-38.185-6.5-67.625-6.338-30.57-19.043-68.323-44.938-112.38zm-18.5 43.47c-4.0843 8.6097-7.7042 17.358-9.625 26.625-1.4896 7.1866-2.4132 16.258-2.9375 25.844 22.175 24.309 42.158 50.312 58.969 90.125 3.4579-1.7928 7.1757-3.2074 11.125-4.2188-3.7332-44.676-26.103-93.015-57.531-138.38zm580.81 48.844c-9.2842 18.637-14.059 39.387-53.594 44.062l125.19 98.91c1.4984-5.8311 3.2059-11.746 5.1562-17.719l-76.75-125.25zm-593.69 10.75c-0.9772 27.48 0.71875 56.438 0.71875 56.438s-25.623-5.0315-54.625 0.375c28.226 19.504 54.893 35.742 96.188 41.75 3.3503-5.3341 7.622-9.6826 12.656-13.031-15.748-37.511-34.23-62.427-54.938-85.531zm536.35 36.72c1.6918 30.556-18.916 48.757-37.812 67.875l163.4 42.53c0.6047-3.1729 1.2773-6.3742 2.0312-9.5938l-127.62-100.82zm-596.97 21.5c-6.6621 1.6098-13.392 3.8239-19.969 6.8125-7.5678 3.439-14.631 7.8737-21.438 12.781 39.489 17.341 82.596 33.893 138.81 33.094 0.7939-2.7396 1.7935-5.2868 2.9375-7.6875-43.107-6.6731-70.85-24.48-100.34-45zm-46.031 23.031c-10.863 8.2454-21.239 17.364-32.281 25.125 45.02 15.235 99.214 26.522 173.31 20.594 0.12486-3.9184 0.54621-7.5869 1.2188-11.031-57.872 0.55737-102.18-16.995-142.25-34.688zm604.22 28.22c5.8934 20.68 11.674 41.381-10.188 71.312l171.28 9.0938c-0.63832-12.154 0.20157-24.78 2.375-37.812l-163.46-42.59zm-641.69 0.44c-7.1756 4.6316-14.693 8.551-22.844 11.188-12.831 4.1506-40.406 2-40.406 2s62.21 34.099 133.34 34.344c36.914 0.12714 108.59-21.719 108.59-21.719-0.088-1.2699-0.15264-2.4916-0.1875-3.7188-76.564 6.0624-132.43-6.1445-178.5-22.094zm632.62 75.938c21.924 20.333 27.464 40.667 17.812 61l155.07-36.04c-1.099-5.2-1.87-10.5-2.344-15.9l-170.54-9.07zm174 29.844-155.16 36.062c17.893 12.981 36.075 25.332 42.406 63.75l117.88-84.16c-2.0723-5.113-3.7721-10.318-5.125-15.656zm7.1562 20.375-117.34 83.75c27.55 16.634 33.295 42.585 25.188 74.5l101.53-141.4c-3.636-5.4524-6.7424-11.078-9.375-16.844z"
- fill="#b8447f" />
- <path
- id="path3690"
- fill="#c4bb5c"
- d="m315.34 468.97c-2.0623 0.072-3.9944 0.45051-5.7188 1.0312-138.62 46.685-154.54 106.55-174.25 163.66 27.362-36.434 73.091-114.73 203.03-113.12 4.7148-14.479 2.6304-23.518-5.0625-39.406-4.6705-9.6464-11.813-12.372-18-12.156zm-178.46 165.69c65.629-24.752 121.89-60.762 219.22-47.469 7.2207-16.167 12.112-40.582-6.7438-58.934-117.1-7.62-178.64 58.15-212.48 106.4z" />
- <path
- id="path3720"
- fill="#9dbbbf"
- d="m40.406 295.25s18.2-12.174 27.274-9.0914c14.811 5.0325 23.713 24.6 28.789 39.396 16.155 47.09 6.7035 164.93 91.419 180.31 6.8274 1.2396 11.388-7.6635 2.0203-11.112-70.467-25.94-61.893-103.84-85.358-172.74-5.8825-17.272-18.437-37.526-36.365-40.911-10.21-1.928-27.779 14.142-27.779 14.142z" />
- <path
- id="path3724"
- fill="#8264a7"
- d="m-335.88 273.53c9.9189 17.184 6.6537 32.04-3.4688 45.688 66.933 14.244 106.19 32.679 142.25 54.344 13.847-9.8697 28.829-19 45.25-26.969-21.644-19.936-95.979-70.173-184.03-73.062zm-5.18 50.47c11.15 18.772 9.3564 41.859-9.25 56.438 12.031 0.92731 30.186 3.8881 50.125 9.5938 18.415 5.2696 38.189 12.912 55.625 23.562 13.166-12.812 27.387-25.306 43.094-36.875-35.36-21.09-73.86-38.81-139.59-52.72zm-12.531 61.25c4.2871 19.407 5.8212 38.649-12.344 52.781 26.74 3.6818 55.111 8.231 83.656 15.375 10.711-11.945 21.934-24.193 34.062-36.219-16.652-9.9765-35.629-17.274-53.344-22.344-21.261-6.0839-40.798-8.9639-52.031-9.5938zm-15.031 57.469c10.045 18.188 17.401 37.305-11.281 57.906 15.662 1.2267 32.34 3.0671 48.875 5.6562 14.68-14.331 29.321-31.118 45-48.688-28.131-6.8814-56.139-11.264-82.594-14.875zm-10.25 63c5.4716 7.1956 5.4734 19.382 2.0312 34.75 14.472-6.9538 27.945-17.292 41.25-29.781-14.646-2.1957-29.35-3.8428-43.281-4.9688zm-182.79 24.16c-16.699 14.71-13.675 28-12.125 41.406 129.06 123.9 354.05 217.21 475.81 223.53 20.767 1.0774 40.465 1.6504 59.188 1.7812-0.83336-13.134-7.1471-26.337-30.156-41.031-6.014-25.845-15.226-41.945-24.031-52.438-237.87-35.127-409.46-129.3-468.69-173.25zm860.47 169.53c-86.679 14.53-169.5 19.097-247.25 16.625l-56.719 80.312c201.62-4.6197 275.66-64.054 303.97-96.938z" />
- </g>
- </g>
- <metadata
- id="metadata13">
- <rdf:RDF>
- <cc:Work>
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:publisher>
- <cc:Agent
- rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:title>Whale-Fish</dc:title>
- <dc:date>2011-05-18T20:27:37</dc:date>
- <dc:description>clip art, clipart, fairy-tale, fish, folklore, ocean, sea, whale, </dc:description>
- <dc:source>http://openclipart.org/detail/139447/whale-fish-by-rones</dc:source>
- <dc:creator>
- <cc:Agent>
- <dc:title>rones</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>clip art</rdf:li>
- <rdf:li>clipart</rdf:li>
- <rdf:li>fairy-tale</rdf:li>
- <rdf:li>fish</rdf:li>
- <rdf:li>folklore</rdf:li>
- <rdf:li>ocean</rdf:li>
- <rdf:li>sea</rdf:li>
- <rdf:li>whale</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/src/activities/reversecount/resource/baleine.svg b/src/activities/reversecount/resource/baleine.svg
deleted file mode 100644
index 76dfe5909..000000000
--- a/src/activities/reversecount/resource/baleine.svg
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg602"
- sodipodi:version="0.32"
- width="542.20386"
- height="328.65765"
- xml:space="preserve"
- sodipodi:docname="baleine.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.0"><metadata
- id="metadata52"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs604"><linearGradient
- id="linearGradient730"><stop
- style="stop-color:#00b8c5;stop-opacity:0.2471;"
- offset="0"
- id="stop731" /><stop
- style="stop-color:#00a3b0;stop-opacity:0.7725;"
- offset="1"
- id="stop732" /></linearGradient><linearGradient
- id="linearGradient697"><stop
- style="stop-color:#c2c2c2;stop-opacity:0.5843;"
- offset="0"
- id="stop698" /><stop
- style="stop-color:#d7ef87;stop-opacity:0.6784;"
- offset="1"
- id="stop699" /></linearGradient><linearGradient
- id="linearGradient680"><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop681" /><stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop682" /></linearGradient><linearGradient
- id="linearGradient675"><stop
- style="stop-color:#d5c299;stop-opacity:1;"
- offset="0"
- id="stop676" /><stop
- style="stop-color:#d7ef87;stop-opacity:1;"
- offset="1"
- id="stop677" /></linearGradient><linearGradient
- id="linearGradient648"><stop
- style="stop-color:#191c42;stop-opacity:1;"
- offset="0"
- id="stop649" /><stop
- style="stop-color:#667894;stop-opacity:1;"
- offset="1"
- id="stop650" /></linearGradient><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient675"
- id="linearGradient2227"
- spreadMethod="reflect"
- x1="193.25809"
- y1="739.56921"
- x2="196.18951"
- y2="741.02264"
- gradientTransform="scale(1.8807015,0.5317165)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2229"
- x1="852.28796"
- y1="420.13165"
- x2="960.75818"
- y2="420.13165"
- gradientTransform="scale(0.6254248,1.5989133)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2231"
- x1="80.096237"
- y1="492.60013"
- x2="506.01083"
- y2="492.60013"
- gradientTransform="scale(1.5859308,0.6305445)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2233"
- x1="126.93458"
- y1="667.19916"
- x2="210.9185"
- y2="667.19916"
- gradientTransform="scale(1.2611473,0.7929288)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2235"
- x1="208.80136"
- y1="672.68066"
- x2="321.64752"
- y2="672.68066"
- gradientTransform="scale(1.5134697,0.6607334)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2237"
- gradientTransform="scale(1.0892389,0.9180723)"
- x1="527.01508"
- y1="485.64624"
- x2="549.77368"
- y2="485.64624"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient680"
- id="radialGradient2239"
- gradientTransform="scale(1.0408337,0.9607683)"
- cx="509.71149"
- cy="566.71265"
- fx="509.71149"
- fy="566.71265"
- r="5.3610978"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2241"
- x1="2.7110934"
- y1="677.0036"
- x2="114.79267"
- y2="677.0036"
- gradientTransform="scale(1.7158984,0.5827851)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient648"
- id="linearGradient2243"
- x1="399.18549"
- y1="623.85706"
- x2="382.50131"
- y2="623.85785"
- gradientTransform="scale(1.3328126,0.750293)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2245"
- spreadMethod="repeat"
- x1="445.85782"
- y1="604.3822"
- x2="446.50424"
- y2="606.95593"
- gradientTransform="scale(1.1975744,0.8350212)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2247"
- spreadMethod="repeat"
- x1="442.07745"
- y1="642.34393"
- x2="442.71289"
- y2="644.87384"
- gradientTransform="scale(1.3503863,0.7405289)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2249"
- spreadMethod="repeat"
- x1="584.24469"
- y1="588.78644"
- x2="584.69617"
- y2="590.5838"
- gradientTransform="scale(1.1649668,0.8583935)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2251"
- spreadMethod="repeat"
- x1="417.07773"
- y1="749.0155"
- x2="417.54016"
- y2="750.85663"
- gradientTransform="scale(1.5041231,0.6648392)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2253"
- spreadMethod="repeat"
- x1="407.9501"
- y1="637.26379"
- x2="408.58554"
- y2="639.7937"
- gradientTransform="scale(1.3503863,0.7405289)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2255"
- spreadMethod="repeat"
- x1="252.15698"
- y1="883.86829"
- x2="252.69012"
- y2="885.99091"
- gradientTransform="scale(1.8406776,0.5432782)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient697"
- id="linearGradient2257"
- spreadMethod="repeat"
- x1="483.70346"
- y1="648.93097"
- x2="484.33801"
- y2="651.4574"
- gradientTransform="scale(1.3449336,0.7435311)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient730"
- id="linearGradient2259"
- x1="308.86273"
- y1="830.98694"
- x2="305.01724"
- y2="1061.8368"
- gradientTransform="scale(1.3260928,0.754095)"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="1.0186359"
- inkscape:cx="262.18127"
- inkscape:cy="274.28247"
- inkscape:window-width="1366"
- inkscape:window-height="713"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
- inkscape:current-layer="g2204"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="1" /><g
- id="g2204"
- transform="matrix(0.8,0,0,0.8,-48.919949,-432.85452)"><g
- transform="matrix(0.981174,0,0,1,34.32483,7.802322)"
- id="g734"><g
- transform="matrix(-0.99477,-0.102139,-0.102139,0.99477,810.5366,136.8165)"
- id="g710"><path
- transform="matrix(0.997319,-0.07317368,0.07317368,0.997319,110.5446,177.2834)"
- sodipodi:ry="33.210602"
- sodipodi:rx="117.46716"
- sodipodi:cy="389.37991"
- sodipodi:cx="475.40381"
- d="m 592.87097,389.37991 a 117.46716,33.210602 0 0 1 -117.46716,33.21061 117.46716,33.210602 0 0 1 -117.46716,-33.21061 117.46716,33.210602 0 0 1 117.46716,-33.2106 117.46716,33.210602 0 0 1 117.46716,33.2106 z"
- id="path674"
- style="fill:url(#linearGradient2227);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="matrix(0.812496,-0.518453,0.515596,0.816998,-309.5575,244.179)"
- sodipodi:nodetypes="ccccccccccccc"
- id="path639"
- d="m 542.6321,783.688 c 0.0992,-1.6157 1.1301,-8.4603 0.005,-9.6054 -3.371,-3.4293 -1.6682,-41.2181 -2.5826,-49.2381 -3.5169,-8.4954 -5.3938,-13.9685 -6.6855,-23.2544 -2.3882,-17.1685 8.4705,-35.6303 27.812,-28.1094 14.1119,5.4873 29.5366,55.7958 33.1454,70.1215 6.1943,24.5888 10.3678,72.6742 1.3307,96.5545 -5.707,15.0802 -13.9579,-8.3207 -15.9722,-10.6234 -2.2929,-2.6212 -5.6334,-4.5455 -8.1506,-7.1216 -1.8668,-1.9106 -1.2037,-4.9008 -2.9758,-6.8115 -1.4452,-1.5584 -4.4529,-2.4645 -6.2413,-3.554 -2.2011,-1.3409 -5.3603,-13.5429 -9.8719,-16.4527 -2.0115,-1.2972 -8.8707,-8.5941 -9.8127,-11.9055 z"
- style="font-size:12px;fill:url(#linearGradient2229);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.812496,-0.518453,0.515596,0.816998,-208.7229,472.2169)"
- sodipodi:nodetypes="ccccccsssssssccccccss"
- id="path611"
- d="m 135.4627,389.9425 c 13.4698,-22.5339 73.2459,-61.9856 101.0862,-72.3781 42.7723,-15.9661 176.659,-0.7815 213.5703,8.9901 21.915,5.8016 145.0098,46.2758 172.4394,64.3739 24.225,15.8178 62.24,25.4661 91.6012,47.2331 31.7344,23.5268 62.004,67.2662 84.727,100.2555 5.5757,12.0223 4.3545,25.129 -1.33,32.065 -7.6325,4.115 -50.9314,-31.5997 -89.2756,-61.9472 -20.3259,-15.8432 -53.3462,-17.3418 -69.5402,-27.5782 -16.1939,-10.2364 -23.5616,-19.9777 -24.26,-19.8832 -1.6413,0.2422 4.3917,10.837 19.4931,22.1066 15.1013,11.2695 59.7161,11.25 70.9511,33.8328 12.1906,23.3164 45.1982,41.3112 60.717,50.9062 18.2518,10.92 26.1586,0.373 25.0377,2.304 -6.2173,12.32 -11.5753,9.467 -26.5027,5.763 -49.6176,-12.664 -109.609,-38.7334 -159.4243,-42.6702 -54.5157,6.8822 -127.0481,3.759 -170.2924,-16.2586 -35.1518,-16.2717 -64.2679,-35.3792 -95.5075,-58.0689 -28.5867,-20.7629 -78.6741,-57.7081 -113.4922,-63.4392 -6.2272,-1.0251 -37.185,1.9783 -45.1139,8.1663 -16.1835,11.0483 -74.9609,36.5432 -44.8842,-13.7729 z"
- style="font-size:12px;fill:url(#linearGradient2231);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccc"
- id="path616"
- d="m 160.0832,595.6347 c 4.73,-6.8468 4.6919,-11.3591 19.9443,-23.6251 1.1073,-2.9543 12.0463,-13.3918 17.1948,-13.2227 6.8063,-5.5173 10.3425,-9.0473 18.2129,-11.0558 7.1719,-3.952 8.4603,-8.2973 16.4179,-11.3292 2.5945,-0.4651 6.9487,-2.7567 11.6564,-5.7812 7.5448,-3.4028 16.7241,-0.2521 22.4898,-0.2213 -1.3437,5.2827 -56.5965,25.7624 -105.9161,65.2353 z"
- style="font-size:12px;fill:url(#linearGradient2233);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.812496,-0.518453,0.515596,0.816998,-208.7229,472.2169)"
- sodipodi:nodetypes="ccccccccccccc"
- id="path615"
- d="m 374.4287,459.4183 c 1.6187,0 8.5136,0.6097 9.5875,-0.5839 3.2164,-3.5748 41.0386,-4.1899 48.9876,-5.5939 8.2639,-4.0306 13.6118,-6.2393 22.8012,-8.0974 16.9899,-3.4353 36.0821,6.2721 29.7602,26.0379 -4.6125,14.4215 -53.8817,32.8989 -67.9594,37.3785 -24.1633,7.6889 -71.9028,14.8001 -96.2917,7.2427 -15.4016,-4.7725 7.45,-14.4414 9.625,-16.5929 2.4758,-2.4492 4.1919,-5.9013 6.609,-8.5716 1.7926,-1.9803 4.8179,-1.5016 6.6164,-3.3874 1.4669,-1.538 2.1871,-4.5955 3.1651,-6.4473 1.2035,-2.2791 13.189,-6.1798 15.8169,-10.8612 1.1716,-2.0872 8.0347,-9.3804 11.2822,-10.5235 z"
- style="font-size:12px;fill:url(#linearGradient2235);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- transform="translate(-0.434875,-5.653412)"
- id="g684"><path
- sodipodi:nodetypes="cscsc"
- id="path683"
- d="m 598.8349,456.142 c 0,6.5234 -9.7084,12.297 -15.3438,10.1567 -6.6156,-3.0424 -9.4458,-2.7193 -9.4458,-9.2427 4.7853,-5.4263 8.0579,-9.4828 10.8547,-10.6116 5.4968,-2.4515 13.9349,3.1742 13.9349,9.6976 z"
- style="font-size:12px;fill:url(#linearGradient2237);fill-rule:evenodd"
- transform="matrix(1.147496,-0.173599,0.147987,0.757176,-211.7008,300.2777)"
- inkscape:connector-curvature="0" /><path
- transform="translate(-0.434875,-0.434906)"
- sodipodi:ry="7.380127"
- sodipodi:rx="7.9951477"
- sodipodi:cy="544.36279"
- sodipodi:cx="530.75476"
- d="m 538.74991,544.36279 a 7.9951477,7.380127 0 0 1 -7.99515,7.38013 7.9951477,7.380127 0 0 1 -7.99515,-7.38013 7.9951477,7.380127 0 0 1 7.99515,-7.38012 7.9951477,7.380127 0 0 1 7.99515,7.38012 z"
- id="path678"
- style="fill:url(#radialGradient2239);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /></g><path
- transform="matrix(0.812496,-0.518453,0.515596,0.816998,-208.7229,472.2169)"
- sodipodi:nodetypes="cccccccccc"
- id="path610"
- d="m 177.8093,403.4299 c 14.9799,13.9961 34.8561,39.8662 -1.0776,53.7335 -13.4888,4.3296 -3.0716,3.6121 -15.7632,-3.2622 -6.6461,-3.5999 -38.8574,-2.751 -47.1204,-2.7536 -6.4857,-0.002 2.1751,-11.3129 -1.2256,-16.7455 -10.9897,11.1376 -17.72733,3.9404 -29.97181,8.9259 C 38.9395,417.3779 6.534189,424.9553 4.96688,419.1811 -1.263454,409.0696 86.40347,389.1092 139.1196,395.9429 c 4.1634,7.2806 -2.7459,15.5928 -8.6136,22.2637 6.3775,5.6158 32.8975,-5.917 47.3033,-14.7767 z"
- style="font-size:12px;fill:url(#linearGradient2241);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path693"
- d="m 532.0095,472.1526 c 1.2075,3.5323 -6.3138,7.224 -16.7993,8.2459 -11.3651,-9.0362 10.7572,1.5257 6.8936,-7.2806 -2.3262,-6.8044 -16.2248,4.1939 -11.0633,-4.9158 10.4856,-1.0219 19.7613,0.4182 20.969,3.9505 z"
- style="font-size:12px;fill:url(#linearGradient2243);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path702"
- d="m 534.6679,510.9158 c 2.112,-4.1929 6.5611,-6.9957 7.6664,-9.543 5.3966,-3.6312 13.4716,-4.681 9.4077,0.9338 1.4325,2.7169 1.5356,3.9056 -4.1853,6.9219 -6.1086,1.256 -11.4563,4.4042 -12.8888,1.6873 z m -2.5368,1.3376 c -2.0592,-3.9056 2.4328,-8.3554 9.167,-13.8706 7.1218,-3.7549 10.5973,-1.9341 16.6238,0.2727 0.1773,1.3613 -2.0451,10.1156 -9.167,13.8705 -7.0869,1.7719 -14.5647,3.6329 -16.6238,-0.2726 z"
- style="font-size:12px;fill:url(#linearGradient2245);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path703"
- d="m 597.2712,476.2987 c 3.8237,2.7239 9.0665,3.1282 11.2322,4.8661 6.4673,0.6952 14.0999,-2.1423 7.8864,-5.2137 0,-3.0714 -0.4632,-4.171 -6.9305,-4.171 -5.9894,1.7379 -12.1881,1.4472 -12.1881,4.5186 z m -2.8679,-10e-5 c 0,4.4152 6.0488,6.2564 14.578,7.9943 8.0511,0 10.2762,-3.2315 14.5779,-7.9943 -0.478,-1.2869 -6.5268,-7.9943 -14.5779,-7.9943 -7.0953,1.7379 -14.578,3.5792 -14.578,7.9943 z"
- style="font-size:12px;fill:url(#linearGradient2247);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path704"
- d="m 695.1613,505.9248 c -2.3436,2.2432 -5.5569,2.5761 -6.8843,4.0074 -3.9638,0.5725 -8.6418,-1.7643 -4.8336,-4.2937 0,-2.5294 0.2839,-3.4349 4.2478,-3.4349 3.6709,1.4312 7.4701,1.1918 7.4701,3.7212 z m 1.7577,-1e-4 c 0,3.636 -3.7073,5.1523 -8.9349,6.5835 -4.9345,0 -6.2983,-2.6612 -8.9348,-6.5835 0.293,-1.0598 4.0003,-6.5836 8.9348,-6.5836 4.3488,1.4313 8.9349,2.9476 8.9349,6.5836 z"
- style="font-size:12px;fill:url(#linearGradient2249);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path705"
- d="m 627.7756,495.7688 c 3.9292,-0.6982 8.2667,0.2461 10.5537,-0.2607 5.4124,1.0527 10.6471,4.3838 4.6893,4.7447 -0.9682,1.7538 -1.6868,2.2778 -6.8802,0.8281 -4.2617,-2.3348 -9.3311,-3.5584 -8.3628,-5.3121 z m -2.303,-0.6428 c 1.3918,-2.521 6.8296,-2.2165 14.2265,-1.297 6.4652,1.8048 7.2333,4.1487 9.1862,7.8325 -0.7895,0.6276 -7.7613,3.1017 -14.2265,1.2969 -5.1497,-2.5827 -10.5781,-5.3114 -9.1862,-7.8324 z"
- style="font-size:12px;fill:url(#linearGradient2251);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path706"
- d="m 574.6062,472.5367 c -3.8237,2.7239 -9.0665,3.1282 -11.2322,4.8661 -6.4673,0.6952 -14.0999,-2.1423 -7.8864,-5.2137 0,-3.0714 0.4632,-4.171 6.9305,-4.171 5.9894,1.7379 12.1881,1.4472 12.1881,4.5186 z m 2.8679,-10e-5 c 0,4.4152 -6.0488,6.2564 -14.578,7.9943 -8.0511,0 -10.2762,-3.2315 -14.5779,-7.9943 0.478,-1.2869 6.5268,-7.9943 14.5779,-7.9943 7.0953,1.7379 14.578,3.5792 14.578,7.9943 z"
- style="font-size:12px;fill:url(#linearGradient2253);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path707"
- d="m 490.9173,479.6167 c -5.6682,1.9478 -11.7949,2.5936 -15.1017,3.8153 -7.6548,0.9162 -14.8821,-0.2264 -6.3405,-2.5678 1.5171,-1.8673 2.5838,-2.5712 9.8953,-3.0646 5.9127,0.5995 13.0639,-0.0501 11.5469,1.8171 z m 3.2422,-0.2189 c -2.1808,2.6843 -9.9283,4.2651 -20.4292,5.9724 -9.1019,0.6144 -10.0212,-1.1804 -12.532,-3.7478 1.1761,-0.8188 11.3274,-5.358 20.4292,-5.9724 7.163,0.5152 14.7128,1.0637 12.532,3.7478 z"
- style="font-size:12px;fill:url(#linearGradient2255);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccc"
- id="path708"
- d="m 650.8736,479.585 c 4.1605,-1.4038 9.4228,-0.2358 11.805,-1.2119 6.5172,1.2583 13.7225,6.1401 7.1419,7.1629 -0.4081,2.8522 -1.0144,3.7369 -7.4391,1.8331 -5.719,-3.3771 -11.9157,-4.9321 -11.5078,-7.7841 z m -2.849,-0.8444 c 0.5866,-4.0999 6.8402,-4.0288 15.5445,-3.1317 7.9981,2.3702 9.7792,6.026 13.4199,11.7151 -0.6459,1.0542 -7.5462,5.5021 -15.5443,3.132 -6.8178,-3.7027 -14.0067,-7.6155 -13.4201,-11.7154 z"
- style="font-size:12px;fill:url(#linearGradient2257);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><path
- sodipodi:nodetypes="cscccssssccccsssssccsccsscscccssss"
- id="path733"
- d="m 422.2995,808.9001 c 1.7981,4.604 7.4732,16.6738 3.1509,19.2527 -6.84,3.8996 -46.7313,-23.1327 -74.2953,-63.5244 -66.9358,-9.2845 -130.0065,-69.6221 -141.8588,-79.7845 -1.0192,-0.7567 -3.3743,0.5644 -7.8682,0.3662 -3.9714,0.0727 -14.0872,6.2846 -15.8087,6.6685 -3.4392,0.6522 -4.8777,-1.6016 -8.2092,-0.9263 -2.2401,0.4773 -2.6575,3.0744 -7.1589,3.399 -5.3358,0.3752 -7.9999,-0.2449 -8.8535,0.1879 -5.1054,2.2815 -16.2081,8.4132 -18.9478,4.9697 -3.7733,-6.1985 11.2491,-28.4484 23.7608,-45.6854 95.5024,42.452 320.0393,-15.3813 288.5732,-37.4202 8.5937,4.5914 18.8144,10.0374 35.5041,20.4894 11.4097,-0.1084 18.9928,0.5569 22.4361,2.0855 1.3178,0.7888 3.9013,2.3627 6.6399,4.5203 2.4297,2.0951 6.0533,3.2657 8.6122,4.831 3.3219,2.1213 7.6616,7.4024 8.9273,9.1327 0.5351,0.7105 5.9514,2.252 11.1522,6.5266 5.3497,4.1674 6.6491,6.0325 8.6605,8.094 4.3184,0.4668 13.3246,9.4138 16.2985,15.3028 4.8106,4.0523 7.262,7.8015 9.4902,10.7284 3.8358,5.8712 7.1769,12.601 7.8984,14.8826 19.8459,15.0992 51.1183,104.6658 43.9895,135.3324 34.4239,20.795 92.2615,88.149 82.6415,94.841 -8.885,5.7913 -13.6834,-17.3238 -73.906,-27.2907 -2.3587,-0.3874 -18.2835,-15.3459 -16.9956,-25.0852 -1.2115,-1.9494 -6.128,13.0199 -9.7917,12.8154 -2.1297,-0.1268 -32.52,-30.4473 -48.2879,-26.9924 -10.7289,-13.0299 -24.5858,-44.2685 25.2326,-48.6615 -31.9975,-61.4759 -114.2403,-48.7731 -177.2975,-55.5515 1.9121,3.6671 4.4675,9.9586 4.9367,12.6514 0.4204,2.2973 -1.5728,3.4189 -1.5098,6.4006 0.2503,2.5514 2.8709,5.413 3.0221,6.3125 0.5137,2.5683 -0.7828,9.5212 -0.1378,11.1315 z"
- style="font-size:12px;fill:url(#linearGradient2259);fill-opacity:0.25410019;fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/blue-fish.svg b/src/activities/reversecount/resource/blue-fish.svg
deleted file mode 100644
index 4e4087b81..000000000
--- a/src/activities/reversecount/resource/blue-fish.svg
+++ /dev/null
@@ -1,6250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- viewBox="0 0 705.53027 444.41985"
- version="1.1"
- inkscape:version="0.91 r13725"
- width="100%"
- height="100%"
- sodipodi:docname="blue-fish.svg">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview964"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="0.41415134"
- inkscape:cx="382.7772"
- inkscape:cy="224.14515"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <defs
- id="defs6">
- <linearGradient
- id="linearGradient5691">
- <stop
- id="stop5693"
- stop-color="#2d8afa"
- offset="0" />
- <stop
- id="stop5695"
- stop-color="#47ebcd"
- offset=".30557" />
- <stop
- id="stop5699"
- stop-color="#0082d5"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient5793">
- <stop
- id="stop5795"
- stop-color="#44e1ee"
- stop-opacity=".90435"
- offset="0" />
- <stop
- id="stop5797"
- stop-color="#2a8ff2"
- stop-opacity=".55652"
- offset=".26884" />
- <stop
- id="stop5799"
- stop-color="#0038e7"
- offset=".71692" />
- <stop
- id="stop5801"
- stop-color="#000862"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4156">
- <stop
- id="stop4162"
- stop-color="#001ed5"
- offset="0" />
- <stop
- id="stop83098"
- stop-color="#33c4ff"
- offset=".30557" />
- <stop
- id="stop4160"
- stop-color="#fff"
- offset=".61113" />
- <stop
- id="stop4158"
- stop-color="#296da3"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient4248"
- x1="248.08"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="90.127998"
- gradientTransform="matrix(3.459,0,0,3.459,-157.95,-51.659)"
- x2="262.92001"
- y2="75.182999" />
- <radialGradient
- id="radialGradient4285"
- xlink:href="#linearGradient4156"
- spreadMethod="reflect"
- gradientUnits="userSpaceOnUse"
- cy="87.497002"
- cx="246.25999"
- gradientTransform="matrix(3.8728,2.236,-2.236,3.8728,-104.7728,-670.04531)"
- r="5.4232998" />
- <radialGradient
- id="radialGradient4351"
- gradientUnits="userSpaceOnUse"
- cy="84.844002"
- cx="245.5"
- gradientTransform="matrix(1.0348,0.27728,-0.27728,1.0348,424.1622,58.614692)"
- r="5.4232998">
- <stop
- id="stop4347"
- stop-color="#8a5216"
- offset="0" />
- <stop
- id="stop4349"
- offset="1" />
- </radialGradient>
- <linearGradient
- id="linearGradient21752"
- x1="225.89"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="90.238998"
- gradientTransform="matrix(3.331,0,0,3.2012,-176.7278,-76.073308)"
- x2="237.85001"
- y2="60.528" />
- <linearGradient
- id="linearGradient21961"
- x1="239.28999"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="67.601997"
- gradientTransform="matrix(1.6639,0,0,1.5203,277.02,111.71)"
- x2="248.62"
- y2="84.509003" />
- <linearGradient
- id="linearGradient22037"
- x1="234.32001"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="92.615997"
- gradientTransform="matrix(-0.6767,0.57062,-0.56636,-0.67935,436.8,41.945)"
- x2="277.16"
- y2="37.643002" />
- <linearGradient
- id="linearGradient26569"
- x1="178.27"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- x2="201.73"
- gradientTransform="matrix(2.4166,0,0,2.4681,32.605202,2.9446917)"
- y1="173.09"
- y2="112.86" />
- <linearGradient
- id="linearGradient26746"
- x1="214.3"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- x2="222.49001"
- gradientTransform="matrix(2.6903,0,0,2.6903,-18.061798,-29.761308)"
- y1="153.66"
- y2="111.02" />
- <linearGradient
- id="linearGradient26800"
- x1="214.3"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- x2="222.49001"
- gradientTransform="matrix(1.8695,0.22114,-0.21944,2.5248,196.9222,-54.107308)"
- y1="153.66"
- y2="111.02" />
- <radialGradient
- id="radialGradient26810"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- cy="146.56"
- cx="175.94"
- gradientTransform="matrix(9.1852,0,5.7378e-8,14.782,-1219.2778,-1757.5453)"
- r="19.016001" />
- <filter
- id="filter5195"
- width="1.3502001"
- y="-0.095186003"
- x="-0.17508"
- height="1.1904"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5197"
- stdDeviation="0.53919081" />
- </filter>
- <filter
- id="filter5199"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5201"
- stdDeviation="1.4505859" />
- </filter>
- <filter
- id="filter5215"
- width="1.222"
- y="-0.17643"
- x="-0.111"
- height="1.3529"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5217"
- stdDeviation="0.83538121" />
- </filter>
- <filter
- id="filter5391"
- width="1.0821"
- y="-0.11158"
- x="-0.041032001"
- height="1.2232"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5393"
- stdDeviation="0.49925427" />
- </filter>
- <filter
- id="filter5429"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5431"
- stdDeviation="0.29371364" />
- </filter>
- <filter
- id="filter5483"
- width="1.0831"
- y="-0.26947999"
- x="-0.041551001"
- height="1.539"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5485"
- stdDeviation="4.7550675" />
- </filter>
- <filter
- id="filter5533"
- width="1.3346"
- y="-0.1025"
- x="-0.1673"
- height="1.205"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5535"
- stdDeviation="3.0913843" />
- </filter>
- <filter
- id="filter5635"
- width="1.2728"
- y="-0.12344"
- x="-0.13641"
- height="1.2469"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5637"
- stdDeviation="2.3127244" />
- </filter>
- <filter
- id="filter5656"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5658"
- stdDeviation="1.7064" />
- </filter>
- <linearGradient
- id="linearGradient5709"
- x1="444.92999"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="149.96001"
- gradientTransform="matrix(0.67244,0.45705,0.13558,0.99373,302.3422,-73.861308)"
- x2="370.64999"
- y2="67.976997" />
- <linearGradient
- id="linearGradient5723"
- x1="215.34"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="101.32"
- gradientTransform="matrix(0.91289,0,0,0.91289,14.706,11.132)"
- x2="216.57001"
- y2="-6.3477001" />
- <filter
- id="filter5743"
- width="1.3938"
- y="-0.039717"
- x="-0.19690999"
- height="1.0793999"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5745"
- stdDeviation="1.8206915" />
- </filter>
- <filter
- id="filter5751"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5753"
- stdDeviation="0.74014015" />
- </filter>
- <radialGradient
- id="radialGradient5763"
- xlink:href="#linearGradient5691"
- spreadMethod="reflect"
- gradientUnits="userSpaceOnUse"
- cy="-28.617001"
- cx="275.85999"
- gradientTransform="matrix(-1.2028,4.997,-4.9646,-1.2944,957.81,-1210.3)"
- r="29.993999" />
- <filter
- id="filter5805"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur5807"
- stdDeviation="0.47843627" />
- </filter>
- <linearGradient
- id="linearGradient5945"
- x1="606.83002"
- xlink:href="#linearGradient5691"
- gradientUnits="userSpaceOnUse"
- y1="207.96001"
- gradientTransform="matrix(1.0129,0,0,0.64185,-49.348798,65.574692)"
- x2="701.89001"
- y2="254.31" />
- <radialGradient
- id="radialGradient5997"
- xlink:href="#linearGradient5793"
- spreadMethod="reflect"
- gradientUnits="userSpaceOnUse"
- cy="82.030998"
- cx="197.88"
- gradientTransform="matrix(4.3912,0.04823,-0.0020926,1.2756,-329.3878,99.374692)"
- r="81.094002" />
- <radialGradient
- id="radialGradient6001"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- cy="363.39999"
- cx="114.56"
- gradientTransform="matrix(4.7462,1.2717,-1.2687,4.7349,-104.6888,-1512.6453)"
- r="144.92999" />
- <radialGradient
- id="radialGradient6031"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.512,-8.222,10.655,-10.919,2309.3,2787.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6035"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.117,-7.4391,10.159,-11.775,2466.5,2678)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6038"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.986,-5.5916,8.4847,-11.956,2550.2,2260.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6041"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.193,-2.2613,5.6102,-12.805,2799.4,1559.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6045"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.193,-2.2613,5.6102,-12.805,2787.1,1555)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6049"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-2.4481,-16.269,15.158,0.063872,189.29,3981.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6053"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.0454,-14.814,14.389,-2.0862,595.51,3787.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6057"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.7727,-14.056,13.955,-3.0824,783.32,3674.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6061"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.2017,-13.573,13.99,-4.8574,1099.3,3674.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6065"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.2387,-12.973,13.794,-6.1908,1342.8,3618.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6068"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.1998,-11.726,12.68,-6.3714,1405.1,3338.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6071"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.1549,-11.262,12.579,-7.5833,1625.4,3304.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6075"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.1,-10.05,12.136,-10.1,2093.2,3188.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6079"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.049,-8.1293,10.423,-10.388,2195.2,2762.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6083"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.9889,-7.1325,9.5236,-10.499,2241.6,2532.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6087"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.899,-6.8929,9.6056,-11.616,2442.5,2541.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6091"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.985,-5.3512,8.272,-11.998,2552.7,2206.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6095"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.193,-2.2613,5.6102,-12.805,2777.4,1550.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6099"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.1024,-14.63,14.245,-2.1868,613.12,3759.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6103"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.0757,-14.233,13.886,-2.2275,624.58,3663.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6107"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.4198,-13.676,14.15,-5.0963,1131.4,3720.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6111"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.2073,-13.129,13.922,-6.1253,1319.9,3657)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6115"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.2315,-10.883,12.268,-7.7425,1658,3247.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6119"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.1638,-10.495,12.227,-8.9137,1868.3,3228.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6123"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.047,-9.4516,11.591,-10.147,2108.2,3064.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6127"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.892,-8.152,10.716,-11.38,2356,2842.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6130"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.685,-7.3554,9.9454,-11.281,2359.8,2644.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6133"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.846,-5.8996,8.7115,-11.735,2478.4,2334.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6137"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.455,-5.5591,8.6071,-12.515,2623.7,2298.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6141"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.46,-4.4821,7.6576,-12.716,2689.7,2056)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6145"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.193,-2.2613,5.6102,-12.805,2768.5,1547.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6149"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.8679,-15.09,14.899,-3.0071,738.48,3924.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6153"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.1045,-14.125,14.122,-3.4619,836.6,3728.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6157"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.289,-13.029,13.537,-5.0594,1137.2,3578.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6160"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.8234,-12.183,12.962,-5.844,1290.7,3431.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6163"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.3689,-11.154,12.552,-7.8556,1662.8,3323.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6166"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5724,-11.064,12.538,-8.1123,1705.6,3311.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6169"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.13,-9.4685,11.632,-10.241,2115.2,3082.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6172"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.4407,-9.0156,11.01,-9.5093,1998.3,2921.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6175"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.921,-7.4559,10.11,-11.541,2391.6,2693.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6178"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.093,-6.6287,9.4351,-11.894,2474.7,2519.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6181"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.883,-4.4495,7.4426,-12.041,2560.1,2025.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6184"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.411,-2.9151,6.5809,-14.125,2964.2,1805.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6187"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.2,-3.0222,6.2844,-12.675,2711.3,1721)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6191"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.714,-1.6432,5.2324,-13.532,2900.1,1454)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6194"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.6181,-14.326,14.466,-4.0316,925.69,3817.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6197"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.8824,-13.12,13.486,-4.5628,1043.7,3572.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6200"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.3928,-12.244,13.2,-6.5052,1398,3495.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6203"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.5612,-11.321,12.439,-6.8716,1481.2,3302.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6206"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8023,-9.6819,11.392,-8.6346,1827,3040.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6209"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.6803,-10.526,12.421,-9.518,1952.6,3281.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6212"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.151,-8.9135,11.149,-10.366,2140.8,2963.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6215"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.95,-6.6027,9.3659,-11.73,2438.2,2522)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6218"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.327,-5.5418,8.5506,-12.367,2576.2,2314.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6221"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.37,-5.7472,8.7459,-12.38,2571.9,2350.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6224"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.139,-3.6802,6.8457,-12.483,2646.5,1878.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6227"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.221,-2.6775,6.3095,-13.943,2927.8,1737.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6230"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.733,-0.63382,4.3471,-13.738,2950,1249.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6233"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.573,-0.5689,4.5608,-14.741,3127.9,1289.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6236"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.2316,-14.425,14.105,-2.3767,632.85,3735)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6239"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.8395,-14.398,14.601,-4.2801,955.33,3848.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6242"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.6367,-13.608,14.16,-5.3648,1157.8,3734.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6245"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.1308,-10.659,12.038,-7.6643,1631.1,3212.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6248"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.6568,-10.788,12.645,-9.4426,1930,3352.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6251"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.0573,-9.8782,11.648,-8.9,1856.1,3101.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6254"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.395,-8.9965,11.301,-10.639,2177.7,3008.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6257"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.413,-7.8623,10.305,-10.867,2245.1,2757.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6260"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.651,-5.4825,8.2802,-11.58,2431.9,2256.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6263"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.001,-4.2837,7.3341,-12.21,2572.3,2017)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6266"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.914,-3.9221,6.987,-12.174,2575,1921.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6269"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.2,-1.8155,5.5415,-14.075,2962.4,1561.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6272"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.362,-0.44873,4.3868,-14.515,3077,1269.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6275"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.368,0.70164,3.3727,-14.73,3147.5,1012.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6278"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.345,1.9008,1.9835,-13.741,3011.2,662.27)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6281"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.7212,-14.785,14.905,-4.07,904.9,3927.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6284"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.0846,-12.736,13.858,-7.2327,1501.5,3668.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6287"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.6337,-11.671,13.095,-8.0742,1669.3,3475.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6290"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.2413,-11.335,12.993,-8.8528,1807,3443.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6293"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.8702,-9.0997,11.223,-10.001,2062,3005.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6296"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.7445,-8.7822,10.902,-9.9105,2050,2918.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6299"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.557,-7.1336,9.7079,-11.169,2309.5,2620.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6302"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.569,-6.1221,8.8185,-11.367,2368.3,2395.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6305"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11,-5.2306,8.1702,-12.037,2506.6,2228.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6308"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.445,-3.1626,6.8104,-14.12,2922.7,1889.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6311"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.292,-2.6848,6.016,-12.844,2713.9,1684.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6314"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.332,-1.5791,5.0525,-13.093,2787.3,1440.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6317"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.316,-0.095661,4.0599,-14.524,3076.8,1188.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6320"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.373,1.7675,2.4328,-14.929,3199.9,782.26)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6323"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.082,1.9508,1.8542,-13.438,2948.7,628.72)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6326"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.5201,-12.54,13.18,-5.421,1198.5,3515.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6329"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.8803,-13.03,13.729,-5.7573,1234.3,3641.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6332"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.394,-11.891,12.889,-6.5706,1398.6,3430.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6335"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8387,-11.643,13.136,-8.3215,1701.5,3483.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6338"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.6593,-10.054,11.674,-8.3983,1752.2,3121)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6341"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.424,-8.8705,11.199,-10.697,2177.4,2998.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6344"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.7832,-7.3788,9.6747,-10.211,2129.4,2619.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6347"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.37,-6.0756,8.7132,-11.14,2322.3,2377.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6350"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.957,-5.3669,8.2767,-11.962,2480.9,2262.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6353"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.337,-2.9868,6.6202,-14.024,2901.3,1851.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6356"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.67,-1.6815,5.2519,-13.473,2840.1,1508.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6359"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.429,-1.9209,5.3855,-13.145,2775.6,1530.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6362"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.924,-0.5113,4.3005,-13.985,2960,1256.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6365"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.439,0.44849,3.6191,-14.768,3122.7,1079.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6368"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.438,2.798,1.221,-14.013,3058.1,485.86)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6371"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.803,2.9353,0.89471,-13.288,2938.4,393.95)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6374"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.11,-12.882,13.35,-4.8746,1082.9,3554.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6377"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4212,-11.938,13.261,-7.7749,1602.7,3527.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6380"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4482,-10.876,12.333,-7.9995,1662.8,3294.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6383"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.6984,-10.315,12.24,-9.5777,1944.4,3265.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6386"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.642,-8.5804,11.013,-11.007,2233.5,2960.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6389"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.96,-7.7442,10.377,-11.534,2342.2,2797.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6392"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.731,-6.7067,9.3872,-11.452,2351.7,2548.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6395"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.188,-5.4687,8.4413,-12.217,2514.1,2310)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6398"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.919,-3.3143,6.7744,-13.471,2787.5,1896.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6401"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.123,-3.0003,6.2403,-12.588,2640.7,1756.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6404"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.171,-1.873,5.2601,-12.849,2715.3,1508.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6407"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.23,0.73467,3.2988,-14.573,3084.9,1022.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6410"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.136,1.6713,2.1187,-13.452,2916.3,724.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6413"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.666,2.0062,1.9938,-14.138,3045.1,683.29)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6416"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.785,4.1319,-0.16789,-13.484,2991.8,146.72)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6419"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.173,4.7814,-0.93906,-12.879,2907.1,-52.997)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6422"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.6542,-12.034,13.099,-6.8518,1447.3,3499.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6425"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.5593,-11.735,12.804,-6.7942,1435.8,3421.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6428"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.645,-9.9814,11.606,-8.3945,1752.6,3124.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6431"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.2582,-9.0195,10.954,-9.2931,1926.8,2959.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6434"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.126,-9.4566,11.62,-10.238,2071.1,3113.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6437"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.688,-7.0187,9.6488,-11.344,2323.6,2627.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6440"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.895,-6.122,8.9236,-11.752,2413.2,2443.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6443"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.201,-4.7334,8.1188,-13.546,2757.5,2240)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6446"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.443,-3.1255,6.7769,-14.124,2897.8,1905.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6449"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.803,-1.5274,5.159,-13.659,2858,1503)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6452"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.22,-0.48281,4.3708,-14.34,3002.3,1302.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6455"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.688,0.52757,3.3068,-13.896,2951.4,1033.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6458"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.701,1.5693,2.391,-14.1,3014.6,800.47)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6461"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.321,2.8511,1.1364,-13.885,3012.5,484.83)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6464"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.569,3.1618,0.94176,-14.233,3082,426.22)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6467"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.483,4.7267,-0.79062,-13.236,2953.7,-6.4537)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6470"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.33,5.5721,-1.5867,-13.208,2974.5,-211.88)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6473"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5834,-11.628,13.04,-8.0227,1650,3484)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6476"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8509,-10.774,12.372,-8.4937,1745.4,3315.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6479"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.5193,-9.4834,11.448,-9.5172,1949.5,3084.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6482"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.198,-7.9351,10.3,-10.599,2171.6,2799.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6485"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.485,-8.0183,10.466,-10.923,2218.1,2831.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6488"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.951,-6.4093,9.1954,-11.766,2402,2515.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6491"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.125,-4.5174,7.9035,-13.495,2748.2,2194.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6494"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.348,-3.3918,6.9813,-13.963,2855.4,1962.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6497"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.414,-2.0235,5.4713,-13.108,2740.9,1586.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6500"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.34,-1.8139,5.5853,-14.241,2939.5,1604.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6503"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.644,0.84155,3.0153,-13.9,2951.2,971.14)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6506"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.75,1.9722,2.051,-14.231,3038,726.98)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6509"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.649,2.7342,1.3453,-14.25,3061.3,544.95)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6512"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.876,3.2525,0.63808,-13.431,2933.5,361.72)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6515"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.736,5.1848,-1.1137,-13.617,3019.6,-74.612)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6518"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.004,4.6064,-0.83909,-12.648,2837.1,-20.564)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6521"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.245,5.6484,-2.5213,-11.519,3006.3,-342.66)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6524"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.6655,-11.389,12.856,-8.1631,1679.9,3443.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6527"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.2873,-11.385,12.73,-7.7174,1592.3,3406.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6530"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.056,-8.9813,11.178,-10.242,2086.5,3024.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6533"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.598,-8.045,10.526,-11.053,2243.8,2860)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6536"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.245,-7.6835,10.416,-11.881,2389.3,2826.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6539"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.705,-5.3816,8.5313,-12.843,2612.2,2361.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6542"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.252,-4.795,7.8668,-12.414,2547.5,2191.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6545"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.194,-2.8251,6.1085,-12.704,2646.4,1757)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6548"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.591,-1.7573,5.2933,-13.366,2785.5,1550.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6551"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.637,-1.5738,5.1464,-13.454,2801.8,1505.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6554"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.594,-0.23876,4.2762,-14.826,3073.1,1285.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6557"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.196,1.4117,2.69,-14.656,3086.5,890.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6560"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.028,2.1693,1.644,-13.415,2890.5,625.78)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6563"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.186,3.8238,0.23355,-13.901,3019.5,273.14)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6566"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.043,5.1218,-0.95875,-13.969,3066.8,-27.213)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6569"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.722,6.1964,-2.0117,-13.784,3065.1,-294.29)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6572"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.8554,5.6713,-1.8275,-12.666,2858.2,-262.26)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6575"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.4649,6.3861,-4.174,-10.049,2928.9,-609.09)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6578"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.6177,-9.8173,11.452,-8.3921,1751.6,3101.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6581"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.5725,-10.585,12.438,-9.38,1891.1,3334.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6584"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.677,-8.141,10.636,-11.128,2251.7,2892)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6587"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.197,-7.6559,10.053,-10.649,2173.2,2743)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6590"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.741,-6.7462,9.425,-11.456,2330.1,2583.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6593"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.277,-4.8809,7.9509,-12.429,2542.7,2218.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6596"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.877,-4.2403,7.5787,-13.253,2696.7,2120.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6599"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.683,-1.5865,5.1723,-13.506,2808,1528.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6602"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.553,-0.79981,4.4357,-13.496,2823,1340.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6605"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.183,-0.27725,3.8547,-13.153,2774,1190.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6608"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.738,1.093,2.8235,-14.057,2965,930.88)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6611"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.093,2.301,1.5486,-13.515,2901.9,611.23)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6614"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.074,3.4753,0.50532,-13.706,2965.6,347.81)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6617"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.696,5.3267,-1.2518,-13.596,2996.6,-89.26)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6620"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.217,5.3536,-1.1074,-14.216,3104.6,-65.12)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6623"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.4818,6.8103,-2.954,-12.432,2836.2,-525.61)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6626"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.079,7.0155,-3.2653,-11.993,2767.3,-613.34)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6629"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.318,-11.399,12.753,-7.7509,1596.7,3420.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6632"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.611,-9.5654,11.228,-8.4299,1753.6,3045.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6635"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.335,-9.3844,11.624,-10.499,2106.7,3136.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6638"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.228,-7.1741,9.6375,-10.773,2205.5,2647.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6641"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.463,-6.0833,9.0729,-12.43,2513.8,2504.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6644"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.666,-5.1314,8.2976,-12.842,2603.3,2309)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6647"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.114,-3.7918,7.2593,-13.615,2766.9,2049.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6650"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.158,-2.2402,5.5801,-12.767,2656.2,1633.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6653"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.103,-1.7507,5.4529,-13.972,2872.8,1594.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6656"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.492,0.86999,3.2639,-14.907,3102.3,1055.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6659"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.865,1.4263,2.5703,-14.268,3002.7,877.38)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6662"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.166,2.9192,1.349,-14.895,3149.1,571.78)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6665"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.837,3.9862,0.30028,-14.7,3142.2,307.19)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6668"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.674,4.3938,-0.43506,-13.4,2926.5,117.58)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6671"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.9401,5.7917,-1.9066,-12.788,2858,-250.52)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6674"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.9256,6.2037,-2.2751,-12.846,2879.1,-351.11)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6677"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.9023,6.8198,-2.8267,-12.93,2911.4,-496.46)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6680"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.7523,8.4024,-4.5956,-11.86,2770.9,-938.03)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6683"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.2312,-10.236,12.02,-9.0403,1840.8,3241.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6686"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.093,-9.7043,11.829,-10.154,2037.2,3189.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6689"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.299,-7.14,9.953,-12.043,2424.9,2729.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6692"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.722,-5.5408,8.6774,-12.834,2596.3,2413.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6695"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.464,-4.54,7.71,-12.711,2593.6,2172)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6698"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.556,-3.0575,6.7534,-14.27,2896.6,1933.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6701"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.345,-3.0959,6.3962,-12.832,2639.1,1837.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6704"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.645,-1.0182,4.981,-14.745,3021.3,1487.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6707"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.691,-0.66931,4.3649,-13.682,2841,1328.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6710"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.384,1.7363,2.1411,-13.756,2915.2,780.42)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6713"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.383,1.5613,2.2953,-13.723,2900.5,808.38)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6716"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.951,3.5887,0.68805,-14.762,3133.1,409.41)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6719"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.838,5.0568,-0.96763,-13.715,2989.6,-2.8699)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6722"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.7185,5.8748,-2.0514,-12.541,2807.1,-276.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6725"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.9198,5.7873,-1.9092,-12.763,2842.1,-253.17)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6728"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8091,7.0887,-3.4171,-11.688,2691.5,-630.74)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6731"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.0612,7.8862,-4.04,-12.131,2790.8,-793.16)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6734"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4212,8.8558,-5.103,-11.551,2718.5,-1063.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6737"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.362,-7.9351,10.353,-10.793,2196.6,2836.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6740"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.777,-6.7779,9.4648,-11.493,2338.5,2615.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6743"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.955,-5.8691,8.7198,-11.869,2418.2,2428.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6746"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.039,-5.5246,8.4426,-12.031,2446.1,2354.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6749"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.313,-3.4244,6.999,-13.916,2821.9,1998.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6752"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.759,-1.6303,5.2356,-13.588,2806.4,1562.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6755"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.534,-1.5676,5.1075,-13.333,2756.6,1523.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6758"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.387,-0.07811,3.7446,-13.43,2808,1184.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6761"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.732,1.0384,2.8699,-14.04,2938.8,964.38)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6764"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.982,3.328,0.92863,-14.752,3120.3,484.97)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6767"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.543,3.0378,1.043,-14.18,3009,502.93)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6770"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.602,5.1506,-1.1268,-13.453,2937.9,-33.463)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6773"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.511,5.0383,-1.0567,-13.326,2910.2,-26.719)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6776"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.254,6.2078,-2.1727,-13.234,2924.9,-307.92)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6779"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.4194,8.1679,-4.1732,-12.605,2868.9,-804.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6782"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.0605,8.8337,-4.8771,-12.302,2834.6,-986.43)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6785"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.2682,8.5469,-4.8796,-11.314,2656.1,-999.24)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6788"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.3799,8.459,-5.0887,-10.25,2470.5,-1062.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6791"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.481,-8.6648,11.036,-10.801,2178.5,3006)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6794"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.199,-6.8001,9.2978,-10.807,2218.9,2578.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6797"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.811,-6.2741,9.031,-11.625,2363.9,2508.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6800"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.756,-5.3622,8.2079,-11.726,2396.1,2302.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6803"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.457,-3.9476,7.1848,-12.811,2613.3,2047.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6806"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.98,-3.3014,6.7827,-13.545,2749.4,1943.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6809"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.607,-1.0149,4.6431,-13.52,2800.2,1417.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6812"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.348,0.034055,3.9557,-14.585,3006.3,1243.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6815"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.775,0.94208,2.9687,-14.073,2936.1,995.07)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6818"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.929,1.6455,2.0746,-13.203,2799,769.02)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6821"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.696,3.7143,0.17222,-13.303,2868.5,298.68)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6824"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.348,4.735,-0.84177,-13.077,2853.3,43.219)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6827"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.756,6.4355,-2.2119,-13.868,3033.9,-298.37)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6830"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.4976,6.4639,-2.643,-12.388,2775.6,-413.96)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6833"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.0384,7.0517,-3.3104,-11.952,2714.5,-586.59)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6836"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5643,8.617,-4.8458,-11.677,2709,-969.98)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6839"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.6756,9.4081,-5.8314,-10.771,2573.7,-1220.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6842"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.0565,9.4819,-6.0965,-10.053,2452,-1297.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6845"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.532,-7.105,9.9975,-12.326,2474.3,2753.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6848"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.979,-5.7233,8.5986,-11.923,2430.7,2407.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6851"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.615,-5.0232,8.1857,-12.802,2590.9,2302)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6854"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.223,-2.9687,6.5673,-13.892,2826,1903.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6857"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.304,-1.6894,5.1409,-13.04,2703.9,1550.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6860"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.111,-0.54527,4.391,-14.201,2927.7,1362)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6863"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.176,0.15386,3.4718,-13.224,2769.6,1130.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6866"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.91,1.7319,2.3148,-14.376,3005.6,843.02)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6869"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.315,2.5437,1.4059,-13.822,2925.3,613.92)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6872"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.191,2.8471,1.098,-13.73,2912.1,530.49)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6875"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.966,4.6312,-0.5503,-13.789,2966.5,121.74)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6878"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.6686,5.3679,-1.6199,-12.39,2740.3,-147.88)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6881"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.1255,6.7365,-3.0039,-11.998,2706.7,-493.54)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6884"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.1411,6.4395,-2.7366,-11.962,2689.7,-438.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6887"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.6135,7.1248,-3.5121,-11.464,2620.5,-637.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6890"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.2292,9.2,-5.4689,-11.387,2663.4,-1123.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6893"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.0245,8.7063,-5.4218,-9.8748,2387.5,-1124)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6896"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.8387,9.3528,-6.0527,-9.7728,2388.3,-1288.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6899"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.625,-6.5,9.1702,-11.364,2313,2549.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6902"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.21,-4.4296,7.8534,-13.611,2747.5,2226.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6905"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.899,-4.1001,7.4619,-13.304,2692,2124.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6908"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.194,-2.8447,6.4486,-13.881,2816.1,1872.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6911"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.958,-0.7268,4.502,-13.987,2883.2,1394)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6914"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.242,0.72402,3.3122,-14.586,3018.1,1098.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6917"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.732,1.0986,2.8168,-14.052,2927.7,970.51)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6920"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.39,2.906,1.1101,-13.976,2957.1,548.61)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6923"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.79,2.6774,1.1184,-13.226,2814.3,541.84)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6926"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.727,4.8798,-0.84713,-13.552,2925.8,56.684)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6929"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.194,5.203,-1.3047,-12.981,2830.8,-63.677)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6932"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.346,6.6763,-2.5567,-13.428,2944.8,-376.48)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6935"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.3752,6.4671,-2.6854,-12.244,2730.4,-418.18)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6938"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4909,8.6146,-4.8675,-11.589,2673.7,-957.88)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6941"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.9697,9.7579,-6.0455,-11.182,2632.8,-1254.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6944"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.5962,9.6157,-6.0404,-10.715,2547,-1264.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6947"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.5165,9.7422,-6.5007,-9.4631,2333.3,-1387.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6950"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.2127,10.075,-7.2156,-7.9842,2086.8,-1573.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6953"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.766,-5.3213,8.4977,-12.926,2604.7,2385.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6956"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.945,-3.238,6.7156,-13.516,2752.3,1948.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6959"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.669,-1.7716,5.3312,-13.455,2771,1606.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6962"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.212,-1.5363,4.9758,-12.958,2680.9,1513.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6965"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.615,-0.028324,3.7744,-13.709,2842.8,1215.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6968"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.568,1.8292,2.1185,-13.99,2933.9,806.74)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6971"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.303,2.7858,1.1881,-13.851,2928.1,573.44)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6974"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.935,3.192,1.0335,-14.671,3074.1,528.44)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6977"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.915,4.5045,-0.45501,-13.705,2936.3,158.56)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6980"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.213,5.1892,-0.96358,-14.181,3032,26.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6983"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.2289,6.0974,-2.4061,-12.004,2674.7,-333.36)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6986"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.5799,7.5801,-3.6023,-12.687,2829.9,-632.48)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6989"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.2007,7.4244,-3.91,-11.031,2535.2,-717.86)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6992"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.0278,9.6329,-5.9162,-11.228,2627.7,-1214.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6995"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.41,9.3588,-5.8736,-10.448,2483.3,-1215.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient6998"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.3314,10.078,-6.8567,-9.3055,2304,-1465)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7001"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.6458,10.351,-7.3194,-8.5457,2179.7,-1589)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7004"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.904,-3.7857,7.186,-13.367,2712.1,2065.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7007"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.904,-3.2978,6.755,-13.456,2728.9,1955.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7010"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.21,-1.5915,5.3468,-14.127,2880.9,1608.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7013"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.431,-0.51677,4.1463,-13.403,2774.6,1310.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7016"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.468,1.3515,2.831,-14.966,3087.4,985.35)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7019"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.554,2.5816,1.4496,-14.111,2964.1,642.59)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7022"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.836,3.1793,1.0128,-14.552,3049,529.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7025"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.228,3.9452,0.13991,-13.973,2962.4,309.32)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7028"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.9844,5.9924,-2.0695,-12.877,2822.4,-235.45)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7031"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.341,7.1056,-2.9375,-13.5,2955.4,-454.28)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7034"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.0585,6.9892,-3.2487,-11.965,2681.1,-539.72)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7037"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5406,8.6006,-4.8391,-11.646,2666.1,-935.02)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7040"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.0084,9.6315,-5.9213,-11.204,2614.7,-1207.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7043"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.8521,9.5015,-5.8569,-10.996,2572.5,-1202.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7046"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.9785,9.9038,-6.4942,-10.038,2415.7,-1367.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7049"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.6947,9.8169,-6.8319,-8.5064,2146.9,-1461.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7052"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.6132,11.071,-8.2888,-7.4573,2000.7,-1824.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7055"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.539,-2.6711,6.4066,-14.32,2896.5,1875.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7058"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.229,-1.0947,4.5916,-13.06,2709.5,1428.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7061"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.639,0.32257,3.4721,-13.801,2865.8,1151.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7064"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.152,1.9315,1.894,-13.518,2850.7,762.14)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7067"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.561,3.1757,0.92701,-14.226,2998.1,521.18)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7070"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.474,2.7186,1.3027,-14.041,2944.4,604.91)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7073"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.396,5.3692,-1.0634,-14.43,3076.9,23.744)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7076"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.127,5.976,-2.0088,-13.043,2845.8,-214.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7079"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.3115,6.4658,-2.7048,-12.168,2701.2,-391.93)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7082"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.3278,7.0444,-3.2105,-12.293,2733,-523.22)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7085"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4478,7.7079,-4.0806,-11.374,2587.1,-743.82)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7088"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.5686,9.0198,-5.523,-10.574,2480.6,-1103.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7091"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.994,9.1551,-5.828,-9.9203,2367.6,-1187.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7094"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.8464,9.6101,-6.6003,-8.648,2157.1,-1385.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7097"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.2105,10.107,-6.9214,-9.168,2259.1,-1473.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7100"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.9825,11.105,-8.1991,-7.8994,2065.8,-1795.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7103"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.645,-1.3483,4.9498,-13.505,2780.3,1519.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7106"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.364,-0.73144,4.6369,-14.465,2951.7,1438.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7109"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.858,1.1114,2.8462,-14.203,2945.8,997.98)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7112"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.236,2.2191,1.9898,-14.85,3078,784.15)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7115"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.608,3.5753,0.26659,-13.174,2815.3,358.39)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7118"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.533,4.4847,-0.23816,-14.431,3049.2,229.48)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7121"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.629,6.3336,-2.1627,-13.7,2965.4,-245.27)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7124"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.436,6.9528,-2.7721,-13.584,2955.1,-401.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7127"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.3241,7.0115,-3.1827,-12.282,2724.6,-509.78)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7130"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8166,7.3079,-3.6082,-11.737,2632.5,-622)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7133"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5371,8.4816,-4.735,-11.62,2639.7,-904.39)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7136"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.1317,9.8536,-6.4004,-10.21,2429,-1318.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7139"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.4143,10.655,-7.3399,-9.5083,2326.1,-1556.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7142"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.4355,9.6545,-6.7721,-8.1709,2064.2,-1429.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7145"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.0394,10.163,-7.672,-6.6149,1806.8,-1659.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7148"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.1326,11.27,-8.6193,-6.9259,1892.1,-1895.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7151"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.103,0.71185,3.2781,-14.419,2984.2,1112.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7154"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.187,1.581,2.2146,-13.495,2835.9,848.54)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7157"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.994,2.5518,1.6179,-14.625,3047.2,698.35)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7160"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.315,2.9516,1.0457,-13.896,2921.4,552.62)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7163"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.36,3.9731,0.15805,-14.134,2981.2,330.62)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7166"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.462,5.1087,-1.1348,-13.28,2855.6,9.3448)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7169"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.7358,5.5109,-1.7245,-12.496,2722.6,-141.73)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7172"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.2233,6.3978,-2.6732,-12.052,2662.8,-380.03)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7175"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.9128,8.4985,-4.6287,-12.067,2716.8,-862.57)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7178"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.1406,8.6309,-5.3177,-9.9982,2356.2,-1039.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7181"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.1818,10.364,-6.8353,-10.362,2462.1,-1416.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7184"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.0318,9.6354,-6.5628,-8.8714,2179.6,-1360.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7187"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.0987,10.179,-7.3444,-7.8685,2017.4,-1560.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7190"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.3897,10.11,-7.5117,-7.0188,1865.6,-1611.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7193"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-3.5495,10.107,-7.7803,-6.0263,1691.7,-1688.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7196"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-12.196,0.7586,3.2667,-14.537,2994.5,1108.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7199"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.071,2.7386,1.1548,-13.568,2869.2,589.57)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7202"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.559,3.2902,0.50248,-13.064,2785.7,424.92)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7205"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.416,5.0525,-0.77712,-14.397,3054.8,108.87)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7208"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.247,5.371,-1.113,-14.255,3029.3,20.461)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7211"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.5986,6.9119,-3.0061,-12.588,2774,-446.85)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7214"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.352,7.4041,-3.5203,-12.386,2744.5,-579.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7217"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8199,7.7312,-3.981,-11.818,2647.6,-699.32)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7220"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.827,8.2809,-4.7871,-10.745,2470.3,-903.76)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7223"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.0523,8.3374,-5.087,-9.8406,2309.4,-985.75)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7226"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.4813,9.4791,-6.2797,-9.3738,2255,-1284.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7229"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.2966,10.203,-7.3014,-8.1065,2051.2,-1542.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7232"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.8669,11.099,-8.2315,-7.7619,2012.8,-1777.8)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7235"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.0458,11.123,-8.5178,-6.7967,1843.7,-1858)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7238"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.818,3.5188,0.38435,-13.412,2852.2,400.63)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7241"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-11.332,4.792,-0.57429,-14.25,3021.2,162.48)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7244"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.564,5.4688,-1.4198,-13.466,2893.6,-49.533)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7247"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.129,7.4253,-3.2884,-13.307,2910.3,-509.65)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7250"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.6002,7.7288,-3.7271,-12.738,2811.1,-623.62)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7253"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.3474,8.7067,-4.9951,-11.437,2604.4,-939.49)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7256"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4896,8.4943,-4.7616,-11.566,2613.6,-890.78)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7259"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.1015,9.8976,-6.449,-10.182,2405.9,-1309.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7262"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.8954,9.2829,-6.2955,-8.6464,2117.1,-1281.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7265"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.2039,10.739,-7.8051,-8.0945,2056.7,-1657)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7268"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.2705,10.171,-7.6046,-6.8892,1827.9,-1618.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7271"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-3.622,11.411,-8.9092,-6.3488,1765.1,-1945)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7274"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-3.3659,11.296,-8.8901,-6.0254,1704.9,-1947.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7277"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.129,5.7638,-1.8209,-13.006,2821,-142.57)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7280"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-10.607,6.1088,-1.9712,-13.633,2928.7,-185.16)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7283"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.6745,7.5438,-3.5397,-12.792,2812.9,-572.9)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7286"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.0764,8.3054,-4.4053,-12.225,2726.6,-790.42)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7289"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.1291,8.1593,-4.5821,-11.08,2516,-841.58)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7292"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.486,9.2668,-5.7678,-10.521,2442.4,-1137.4)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7295"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.1097,10.222,-6.7331,-10.251,2415.3,-1380)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7298"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.2843,10.099,-6.8909,-9.2538,2233.4,-1427.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7301"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.3727,10.66,-8.0032,-7.0987,1870.4,-1707.6)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7304"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-3.8542,10.698,-8.2043,-6.4934,1762.4,-1766.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7307"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.8568,7.2917,-3.581,-11.781,2628.9,-578.64)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7310"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.4196,7.9863,-4.0128,-12.572,2775.4,-689.77)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7313"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5401,9.2008,-5.3693,-11.754,2658.3,-1026.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7316"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.2828,9.3447,-5.9022,-10.296,2401.4,-1164.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7319"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.486,9.2668,-5.7678,-10.521,2436.2,-1125.7)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7322"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-6.5218,9.0632,-5.8993,-9.346,2221.7,-1172)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7325"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-5.8896,9.5811,-6.5607,-8.6937,2116.4,-1341.1)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7328"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-4.705,10.628,-7.8679,-7.4852,1930.1,-1667.5)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7331"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.079,7.0155,-3.2653,-11.993,2687,-608.64)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7334"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.079,7.0155,-3.2653,-11.993,2706,-617.32)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7337"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.079,7.0155,-3.2653,-11.993,2720,-618.63)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7340"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.079,7.0155,-3.2653,-11.993,2756.6,-621.48)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7343"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-9.079,7.0155,-3.2653,-11.993,2767.9,-621.21)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7346"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.4212,8.8558,-5.103,-11.551,2718.1,-1066.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7349"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.486,9.2668,-5.7678,-10.521,2427.9,-1133.2)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7352"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-7.486,9.2668,-5.7678,-10.521,2422.4,-1140.3)"
- r="2.8487999" />
- <radialGradient
- id="radialGradient7355"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- cy="66.934998"
- cx="226.7"
- gradientTransform="matrix(-8.5401,9.2008,-5.3693,-11.754,2656.6,-1021)"
- r="2.8487999" />
- <linearGradient
- id="linearGradient7795"
- x1="240.19"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="92.107002"
- gradientTransform="matrix(1.1637,0.085312,-0.17143,0.95428,-169.94,44.484)"
- x2="210.55"
- y2="18.313999" />
- <linearGradient
- id="linearGradient3948"
- x1="46.334999"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- y1="111.69"
- gradientTransform="matrix(2.7759,0,0,2.8852,-50.349498,-26.425308)"
- x2="140.25999"
- y2="72.306999" />
- <radialGradient
- id="radialGradient4730"
- xlink:href="#linearGradient5691"
- gradientUnits="userSpaceOnUse"
- cy="299.04999"
- cx="734.19"
- gradientTransform="matrix(2.6915,0,0,1.1882,-1282.4778,-117.16831)"
- r="12.282" />
- <radialGradient
- id="radialGradient4738"
- xlink:href="#linearGradient5691"
- spreadMethod="reflect"
- gradientUnits="userSpaceOnUse"
- cy="255.97"
- cx="674.34998"
- gradientTransform="matrix(0.34799,0.60147,-0.98697,0.56862,647.8022,-331.97531)"
- r="74.358002" />
- <linearGradient
- id="linearGradient4748"
- x1="261.54001"
- xlink:href="#linearGradient4156"
- gradientUnits="userSpaceOnUse"
- y1="78.709"
- gradientTransform="matrix(2.8591,0.046329,-0.20032,-4.0761,-74.199798,527.64469)"
- x2="154.78999"
- y2="123" />
- <radialGradient
- id="radialGradient4775"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- cy="27.195999"
- cx="144.14999"
- gradientTransform="matrix(9.3944,-5.4239,4.4966,7.7883,-1174.4778,586.05469)"
- r="38.855999" />
- <radialGradient
- id="radialGradient4778"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- cy="128.32001"
- cx="116.22"
- gradientTransform="matrix(9.1144,0,-5.2555e-7,12.119,-781.1378,-1181.4453)"
- r="23.408001" />
- <linearGradient
- id="linearGradient4781"
- x1="113.68"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- y1="121.07"
- gradientTransform="matrix(2.6903,0,0,3.0916,-16.882798,-66.016208)"
- x2="133.13"
- y2="100.3" />
- <linearGradient
- id="linearGradient4802"
- x1="117.16"
- xlink:href="#linearGradient5793"
- gradientUnits="userSpaceOnUse"
- y1="41.470001"
- gradientTransform="matrix(2.2607,0.081535,-0.013825,3.4312,49.942202,-56.793908)"
- x2="133.74001"
- y2="76.799004" />
- </defs>
- <path
- id="path3001"
- style="color:#000000;fill:url(#radialGradient4778)"
- d="m 303.1122,251.91469 c -11.769,8.5003 -22.246,19.457 -28.374,32.745 -2.8282,6.5773 -4.5968,15.534 0.91832,21.247 9.0915,9.6683 22.01,14.403 31.803,23.192 4.026,4.1768 8.6763,8.2083 10.383,14.02 1.5951,6.1686 4.8125,11.973 10.042,15.772 4.5962,4.9311 10.481,-0.50479 12.428,-5.1297 3.3945,-6.0326 5.4627,-12.773 9.4958,-18.437 8.7974,-18.115 3.8112,-39.484 11.835,-57.848 -20.044,-7.2205 -39.628,-15.732 -58.531,-25.562 z"
- inkscape:connector-curvature="0" />
- <path
- id="path21517"
- style="color:#000000;fill:url(#radialGradient4775)"
- d="m 437.9222,0.19669174 c -8.7809,7.71599996 -14.643,20.97500026 -27.175,23.68100026 -11.059,6.3026 -9.9797,17.746 -19.589,25.224 -11.643,0.2238 -9.9658,14.082 -18.626,18.709 -10.697,7.1842 -26.395,8.3804 -32.406,21.334 -6.4195,10.359 -19.151,13.213998 -28.214,20.569998 -10.346,0.80868 -19.11,10.508 -18.732,20.94 2.1324,12.82 15.999,17.645 25.835,23.481 10.434,5.8805 20.667,16.092 33.552,14.365 7.6846,-2.9167 12.893,-10.395 21.137,-12.586 8.3167,-2.8094 16.354,-6.3287 23.588,-11.348 13.445,-6.9574 29.146,-8.6093 44.051,-7.7993 8.9247,1.0016 18.227,7.1459 27.028,2.9168 64.563,-19.827 -20.776,-145.2799983 -30.45,-139.48999826 z"
- inkscape:connector-curvature="0" />
- <path
- id="path12761"
- style="color:#000000;fill:url(#radialGradient6001)"
- d="m 159.7322,151.66469 c -53.474,0.70745 -107.449998,10.303 -156.4799982,31.48 -9.2712,7.6868 3.5522,16.634 10.2120002,15.599 11.986,15.001 32.235,7.9832 45.056,22.512 11.42,3.0201 28.239,0.95444 33.916,14.8 11.486998,-5.0543 14.406998,17.158 28.276998,10.222 5.6459,10.614 21.108,16.923 29.08,16.088 -2.5798,7.8339 -12.027,21.385 0.0854,25.83 -7.2196,8.612 -5.4493,23.963 -8.0294,32.032 -0.47707,17.314 -0.60525,34.374 -7.1853,51.781 -4.184,17.077 -10.501,33.381 -18.374,49.172 0.40941,17.68 21.306,3.0412 26.788,-5.4824 32.176,-30.912 53.5,-70.348 78.147,-106.86 19.318,-35.72 45.702,-68.466 57.319,-104.52 -1.0074,-16.709 -6.3257,-34.451 -26.178,-39.433 -30.472,-7.6483 -61.294,-13.574 -92.631,-13.219 z"
- inkscape:connector-curvature="0" />
- <path
- id="path22087"
- style="color:#000000;fill:url(#linearGradient4781)"
- d="m 314.9822,257.88469 c -6.9724,7.5443 -13.911,15.186 -19.884,23.557 -0.82611,1.0811 -1.6512,2.9616 -0.13492,0.85669 6.7814,-8.2333 14.087,-16.019 21.488,-23.695 -0.49149,-0.23568 -0.9781,-0.48134 -1.4688,-0.71875 z m 8.25,3.875 c -8.1608,11.628 -16.193,23.418 -22.771,36.029 -0.61541,1.094 -1.6582,4.0813 -0.22784,1.3692 7.5031,-12.66 15.966,-24.718 24.436,-36.742 -0.47926,-0.21855 -0.95898,-0.43609 -1.4375,-0.65625 z m 4.0625,1.875 c -7.2016,19.846 -14.581,39.722 -19.232,60.355 -0.29042,1.1313 -0.77825,5.3291 0.002,2.0021 5.5782,-20.816 13.445,-40.92 20.219,-61.349 0.49306,-0.82015 -0.672,-0.66308 -0.98794,-1.0074 z m 8.5,3.6875 c -5.5114,19.689 -11.153,39.43 -14.154,59.69 -0.20871,1.1614 -0.35545,5.3783 0.17517,1.9881 3.9446,-20.645 9.9169,-40.821 15.197,-61.147 l -0.60956,-0.2652 -0.60919,-0.26605 z m 4.2812,1.8125 c -2.7225,18.288 -5.4376,36.659 -5.8087,55.173 -0.0619,1.3075 0.32003,4.4828 0.38572,1.3268 1.288,-18.751 4.199,-37.337 6.798,-55.937 -0.45809,-0.18811 -0.91749,-0.37299 -1.375,-0.5625 z m 6.875,2.7812 c 0.21652,16.004 0.56121,32.071 2.765,47.944 0.13976,1.2808 1.026,4.377 0.60337,1.2676 -1.4338,-16.163 -1.6215,-32.403 -1.8684,-48.618 -0.50054,-0.19655 -1.0001,-0.39555 -1.5,-0.59375 z"
- inkscape:connector-curvature="0" />
- <path
- id="path3003"
- style="color:#000000;fill:url(#linearGradient26746)"
- d="m 597.0122,273.54469 c -8.0163,2.0878 -8.0311,6.5373 -16.488,7.4876 -6.3492,14.541 -15.425,40.099 -8.6352,81.382 1.3564,8.247 21.977,-3.4292 29.458,-20.934 2.9792,-6.9716 -7.066,-15.288 -7.0738,-22.534 -0.0215,-18.66 -3.6677,-37.425 2.7398,-45.401 z"
- inkscape:connector-curvature="0" />
- <path
- id="path26759"
- style="color:#000000;fill:url(#linearGradient26800)"
- d="m 591.1722,268.36469 c -1.5865,2.6345 -1.4586,6.1282 -2.716,8.8864 0.32798,-2.7684 -0.67795,-1.4718 -0.53653,0.48452 -0.54871,6.214 -1.5918,12.457 -4.01,18.079 -7.5945,21.328 -8.8288,67.738 -8.8288,67.738 0,0 0.9911,-5.2315 1.8111,-7.2381 0.99773,-19.916 3.4626,-39.788 8.0982,-59.013 -2.4975,19.936 0.17488,60.208 0.17488,60.208 0,0 1.9759,-1.9721 1.3652,-3.3738 -0.66033,-16.205 -0.58337,-32.46 0.44412,-48.643 0.667,12.431 5.5116,36.733 5.5116,36.733 0,0 -0.47029,-5.0064 0.0108,-6.9535 -2.3666,-15.736 -4.1078,-31.7 -3.9329,-47.694 0.70874,-6.432 1.5318,-12.85 2.6099,-19.213 z"
- inkscape:connector-curvature="0" />
- <path
- id="path26597"
- style="color:#000000;fill:url(#radialGradient26810)"
- d="m 444.3022,299.73469 c -8.9517,8.8257 -17.37,18.134 -25.094,27.969 -3.3652,2.8904 -6.7813,11.601 1.125,9.375 2.3298,0.94185 -3.4304,8.596 -1.4688,12.594 3.6848,6.4538 3.036,13.324 2.9375,20.281 2.9612,5.5545 4.6284,12.104 1.0312,17.844 8.3875,-3.8432 9.5034,5.9386 8.4062,11.5 -0.71921,6.1213 8.5645,2.0708 4.75,8.3438 -0.46426,5.3415 -8.0188,14.481 0.25,16.938 0.54519,1.9797 -7.4202,9.1825 0.5,10.562 2.533,3.4782 -0.0948,10.792 7.2188,9 6.9524,-2.9857 11.288,-9.5253 16.75,-14.406 4.7076,-5.1674 10.364,-9.8752 13.406,-16.188 2.1811,-4.7413 6.0411,-9.0564 8.7188,-13.719 17.604,-27.347 31.983,-57.639 35,-90.062 -0.10116,-1.7884 -0.0856,-3.9462 -0.0937,-6.2188 -24.624,1.5735 -49.327,0.51336 -73.438,-3.8125 z"
- inkscape:connector-curvature="0" />
- <path
- id="path25364"
- style="color:#000000;fill:url(#linearGradient26569)"
- d="m 453.9122,300.44469 c -8.4937,8.3231 -16.967,16.723 -24.236,26.344 -2.4114,3.6653 3.6942,-4.1286 5.316,-5.5312 6.5138,-7.0801 13.415,-13.793 20.121,-20.625 -0.3986,-0.0691 -0.80211,-0.11634 -1.2004,-0.1875 z m 5.66,0.91 c -9.3275,12.612 -19.987,24.001 -29.581,36.375 10.706,-11.589 21.396,-23.303 30.838,-36.156 -0.42072,-0.0622 -0.83714,-0.15429 -1.2575,-0.21875 z m 5.5446,0.8125 c -6.6819,11.491 -15.068,21.756 -23.036,32.188 -2.9016,3.7976 -8.4888,10.292 -10.003,12.062 12.084,-12.123 22.868,-25.869 32.296,-40.531 0.56198,-1.1386 1.3757,-2.3217 2.0292,-3.5625 -0.42776,-0.0529 -0.85864,-0.10102 -1.2861,-0.15625 z m 5.4017,0.625 c -5.34,11.34 -12.71,21.43 -19.77,31.56 -5.4906,7.5447 -11.321,15.303 -17.663,21.719 11.629,-10.463 21.001,-23.576 29.81,-36.844 3.0596,-5.2369 6.8036,-10.398 8.6885,-16.312 -0.35313,-0.036 -0.70451,-0.0875 -1.0575,-0.125 z m 5.4017,0.53125 c -4.7405,12.024 -11.888,22.764 -18.749,33.438 -6.9499,9.9887 -13.72,20.451 -22.722,28.375 9.2412,-7.1595 16.399,-17.145 23.407,-26.812 7.2683,-10.766 14.726,-21.777 18.977,-34.438 0.0411,-0.15548 0.0745,-0.31171 0.11432,-0.46875 -0.34411,-0.0275 -0.68493,-0.0648 -1.0289,-0.0937 z m 5.2588,0.375 c -4.3362,13.052 -11.516,24.774 -18.434,36.344 -7.4986,11.674 -15.059,23.604 -25.008,32.969 -4.2633,3.3817 3.5788,-2.526 4.43,-3.8438 13.385,-13.827 24.214,-30.425 33.296,-47.875 2.5483,-5.5555 5.6885,-11.322 6.5735,-17.531 -0.28574,-0.017 -0.57177,-0.0445 -0.85742,-0.0625 z m 5.3446,0.28125 c -4.079,14.321 -11.494,27.234 -18.692,39.906 -8.0438,13.224 -16.282,26.637 -27.209,37.25 13.038,-11.391 22.837,-26.511 31.867,-41.688 6.0635,-11.016 12.461,-22.337 14.719,-35.125 0.0118,-0.10279 0.018,-0.20944 0.0285,-0.3125 -0.23828,-0.009 -0.47627,-0.0212 -0.71451,-0.0312 z m 20.635,0.0625 c -2.544,17.744 -9.9392,34.111 -17.263,50 -10.099,20.484 -21.219,40.762 -36.04,57.625 -2.0557,2.202 -4.8961,4.843 -1.0003,1.3125 16.089,-15.563 28.032,-35.528 38.412,-55.906 7.0422,-14.787 14.029,-30.209 15.977,-46.938 0.16821,-2.025 0.20057,-4.0723 -0.0285,-6.0938 -0.019,6.6e-4 -0.0381,-6.6e-4 -0.0572,0 z m -15.434,0.0937 c -3.4732,14.591 -10.539,27.833 -17.377,40.812 -8.7756,15.514 -17.989,31.113 -30.21,43.688 -2.9961,2.8861 5.2271,-4.4651 6.7164,-6.5 14.684,-16.755 26.573,-36.394 35.697,-57.312 2.5543,-6.552 5.4633,-13.447 5.7447,-20.656 -0.19103,-0.004 -0.38061,-0.027 -0.57162,-0.0312 z m 10.318,0.0312 c -2.8135,16.433 -9.9633,31.519 -16.977,46.219 -9.615,18.853 -20.094,37.545 -33.925,53.094 -2.0208,2.0976 -3.5655,3.5681 -0.45729,0.71875 15.705,-15.35 27.437,-34.891 37.583,-54.906 6.1754,-13.118 12.493,-26.767 14.004,-41.625 0.0728,-1.1592 0.10356,-2.3403 0.0285,-3.5 -0.0855,10e-4 -0.17169,-0.001 -0.25722,0 z m -5.1731,0.0626 c -3.2267,15.837 -10.523,30.305 -17.634,44.406 -9.091,16.836 -18.805,33.613 -31.61,47.406 -0.92285,0.93948 -2.105,2.0468 -2.6294,2.5312 0.23141,-0.18816 0.61307,-0.46772 1.4004,-1.125 14.605,-13.293 25.452,-30.79 35.154,-48.469 6.6083,-12.935 13.293,-26.342 15.548,-41.125 0.13657,-1.202 0.21993,-2.4127 0.20006,-3.625 -0.14328,-1.7e-4 -0.28543,4e-4 -0.42871,0 z m 15.319,0.46875 c -2.404,18.815 -9.9892,36.251 -17.548,53.156 -10.422,21.829 -22.035,43.375 -37.498,61.438 -1.363,1.6153 -5.5359,5.6014 -1.7434,2.0938 16.871,-16.411 29.316,-37.488 40.07,-59 7.5053,-16.044 14.878,-32.802 16.805,-50.906 0.16829,-2.2529 0.18543,-4.536 -0.0857,-6.7812 z m -65.192,102.75 c -2.3584,1.8441 -6.8288,4.6781 -1.8863,1.5 0.64519,-0.47712 1.2741,-0.97375 1.8863,-1.5 z m 1.4862,9.3125 c -2.2519,1.6973 -6.2436,4.1517 -1.8863,1.4688 0.65351,-0.45496 1.267,-0.95998 1.8863,-1.4688 z m 4.087,7.2188 c -2.4015,2.0181 -7.0537,4.873 -6.3449,4.5625 2.3104,-1.1635 4.3972,-2.7828 6.3449,-4.5625 z"
- inkscape:connector-curvature="0" />
- <g
- id="g7357"
- transform="translate(-38.183598,-33.700308)">
- <path
- id="path12941"
- style="color:#000000;fill:url(#radialGradient7355)"
- d="m 360.47,282.55 c -3.389,-3.5153 -3.6803,-10.229 -0.65067,-14.995 3.0296,-4.7664 8.2329,-5.7806 11.622,-2.2653 3.389,3.5154 3.6803,10.229 0.65065,14.995 -3.0296,4.7664 -8.2329,5.7806 -11.622,2.2652 z"
- inkscape:connector-curvature="0" />
- <path
- id="path12937"
- style="color:#000000;fill:url(#radialGradient7352)"
- d="m 338.91,260.47 c -3.4043,-3.0025 -4.0849,-9.2366 -1.5202,-13.924 2.5647,-4.6878 7.4036,-6.054 10.808,-3.0516 3.4043,3.0025 4.0849,9.2366 1.5201,13.924 -2.5647,4.6878 -7.4036,6.054 -10.808,3.0515 z"
- inkscape:connector-curvature="0" />
- <path
- id="path12933"
- style="color:#000000;fill:url(#radialGradient7349)"
- d="m 344.32,267.56 c -3.4043,-3.0025 -4.0849,-9.2366 -1.5202,-13.924 2.5647,-4.6878 7.4036,-6.054 10.808,-3.0516 3.4043,3.0025 4.0849,9.2366 1.5201,13.924 -2.5648,4.6878 -7.4036,6.054 -10.808,3.0515 z"
- inkscape:connector-curvature="0" />
- <path
- id="path83120"
- style="color:#000000;fill:url(#radialGradient7346)"
- d="m 466.72,172.62 c -3.2635,-3.4807 -3.474,-10.038 -0.47019,-14.646 3.0038,-4.6081 8.0845,-5.522 11.348,-2.0414 3.2635,3.4807 3.474,10.038 0.47017,14.646 -3.0038,4.6081 -8.0845,5.522 -11.348,2.0413 z"
- inkscape:connector-curvature="0" />
- <path
- id="use77773"
- style="color:#000000;fill:url(#radialGradient7343)"
- d="m 489.83,170.53 c -2.6047,-3.9189 -1.9356,-10.253 1.4944,-14.147 3.43,-3.894 8.3221,-3.8738 10.927,0.0451 2.6047,3.9189 1.9356,10.253 -1.4944,14.147 -3.43,3.894 -8.3221,3.8738 -10.927,-0.0452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use77775"
- style="color:#000000;fill:url(#radialGradient7340)"
- d="m 478.56,170.25 c -2.6047,-3.9189 -1.9356,-10.253 1.4944,-14.147 3.43,-3.894 8.3221,-3.8738 10.927,0.0451 2.6047,3.9189 1.9356,10.253 -1.4944,14.147 -3.43,3.894 -8.3221,3.8738 -10.927,-0.0452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use77777"
- style="color:#000000;fill:url(#radialGradient7337)"
- d="m 442,173.1 c -2.6047,-3.9189 -1.9356,-10.253 1.4944,-14.147 3.43,-3.894 8.3221,-3.8738 10.927,0.0451 2.6047,3.9189 1.9356,10.253 -1.4944,14.147 -3.43,3.894 -8.3221,3.8738 -10.927,-0.0452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use77779"
- style="color:#000000;fill:url(#radialGradient7334)"
- d="m 428.01,174.42 c -2.6047,-3.919 -1.9356,-10.253 1.4944,-14.147 3.43,-3.894 8.3221,-3.8738 10.927,0.0451 2.6047,3.919 1.9356,10.253 -1.4944,14.147 -3.43,3.894 -8.3221,3.8738 -10.927,-0.0452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use77781"
- style="color:#000000;fill:url(#radialGradient7331)"
- d="m 408.92,183.09 c -2.6047,-3.9189 -1.9356,-10.253 1.4944,-14.147 3.43,-3.894 8.3221,-3.8738 10.927,0.0451 2.6047,3.919 1.9356,10.253 -1.4944,14.147 -3.43,3.894 -8.3221,3.8738 -10.927,-0.0452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68409"
- style="color:#000000;fill:url(#radialGradient7328)"
- d="m 337.48,244.78 c -3.8732,-1.5713 -6.001,-6.8854 -4.7526,-11.869 1.2485,-4.984 5.4005,-7.7505 9.2737,-6.1792 3.8732,1.5713 6.001,6.8854 4.7526,11.869 -1.2485,4.984 -5.4005,7.7505 -9.2737,6.1792 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68411"
- style="color:#000000;fill:url(#radialGradient7325)"
- d="m 342.18,252.95 c -3.5049,-2.2116 -4.8509,-7.7819 -3.0064,-12.442 1.8445,-4.6596 6.1811,-6.6442 9.686,-4.4325 3.5049,2.2116 4.8509,7.7819 3.0064,12.442 -1.8445,4.6596 -6.1811,6.6442 -9.686,4.4325 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68413"
- style="color:#000000;fill:url(#radialGradient7322)"
- d="m 348.17,261.04 c -3.3231,-2.5506 -4.2664,-8.2695 -2.1069,-12.773 2.1595,-4.5039 6.604,-6.0874 9.9271,-3.5367 3.3231,2.5506 4.2664,8.2695 2.1069,12.773 -2.1595,4.5039 -6.604,6.0874 -9.9271,3.5367 z"
- inkscape:connector-curvature="0" />
- <path
- id="path12929"
- style="color:#000000;fill:url(#radialGradient7319)"
- d="m 352.66,275.06 c -3.4043,-3.0025 -4.0849,-9.2366 -1.5202,-13.924 2.5647,-4.6878 7.4036,-6.054 10.808,-3.0516 3.4043,3.0025 4.0849,9.2366 1.5201,13.924 -2.5647,4.6878 -7.4036,6.054 -10.808,3.0515 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68415"
- style="color:#000000;fill:url(#radialGradient7316)"
- d="m 354.98,269.37 c -3.4308,-2.8993 -4.2095,-9.06 -1.7393,-13.76 2.4702,-4.7003 7.2539,-6.1603 10.685,-3.261 3.4308,2.8993 4.2095,9.06 1.7393,13.76 -2.4702,4.7003 -7.2539,6.1603 -10.685,3.261 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68417"
- style="color:#000000;fill:url(#radialGradient7313)"
- d="m 362.14,277.13 c -3.389,-3.5154 -3.6803,-10.229 -0.65067,-14.995 3.0296,-4.7664 8.2329,-5.7806 11.622,-2.2653 3.389,3.5154 3.6803,10.229 0.65065,14.995 -3.0296,4.7664 -8.2329,5.7806 -11.622,2.2653 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68419"
- style="color:#000000;fill:url(#radialGradient7310)"
- d="m 370.22,283.66 c -2.9577,-4.0194 -2.514,-10.796 0.99115,-15.136 3.5051,-4.3402 8.7443,-4.6003 11.702,-0.58085 2.9577,4.01945 2.514,10.796 -0.99116,15.137 -3.5051,4.3402 -8.7443,4.6003 -11.702,0.58082 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68421"
- style="color:#000000;fill:url(#radialGradient7307)"
- d="m 380.27,289.93 c -2.7026,-3.7936 -2.2084,-10.102 1.1038,-14.091 3.3122,-3.9887 8.1881,-4.1469 10.891,-0.35329 2.7026,3.7936 2.2084,10.102 -1.1038,14.091 -3.3122,3.9887 -8.188,4.1468 -10.891,0.35326 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68445"
- style="color:#000000;fill:url(#radialGradient7304)"
- d="m 340.45,228.17 c -3.8917,-1.1563 -6.3395,-6.0882 -5.4675,-11.016 0.87204,-4.9276 4.7338,-7.9849 8.6254,-6.8286 3.8917,1.1563 6.3395,6.0882 5.4675,11.016 -0.87204,4.9276 -4.7338,7.9848 -8.6254,6.8286 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68447"
- style="color:#000000;fill:url(#radialGradient7301)"
- d="m 344.22,237.68 c -3.882,-1.4089 -6.1364,-6.575 -5.0353,-11.539 1.1011,-4.9638 5.1408,-7.8457 9.0228,-6.4368 3.882,1.4089 6.1364,6.5751 5.0352,11.539 -1.1011,4.9638 -5.1408,7.8456 -9.0228,6.4367 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68449"
- style="color:#000000;fill:url(#radialGradient7298)"
- d="m 347.65,246.71 c -3.695,-2.368 -5.0874,-8.2755 -3.1099,-13.195 1.9775,-4.9193 6.576,-6.9876 10.271,-4.6196 3.695,2.368 5.0874,8.2755 3.1099,13.195 -1.9775,4.9193 -6.576,6.9876 -10.271,4.6196 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68451"
- style="color:#000000;fill:url(#radialGradient7295)"
- d="m 352.79,255.67 c -3.746,-2.7581 -4.8954,-9.0919 -2.5671,-14.147 2.3283,-5.055 7.2525,-6.917 10.999,-4.1588 3.746,2.7581 4.8954,9.0919 2.5671,14.147 -2.3283,5.055 -7.2525,6.9169 -10.999,4.1588 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68453"
- style="color:#000000;fill:url(#radialGradient7292)"
- d="m 358.91,263.39 c -3.4043,-3.0024 -4.0849,-9.2366 -1.5202,-13.924 2.5647,-4.6878 7.4036,-6.054 10.808,-3.0516 3.4043,3.0025 4.0849,9.2366 1.5201,13.924 -2.5647,4.6878 -7.4036,6.054 -10.808,3.0515 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68455"
- style="color:#000000;fill:url(#radialGradient7289)"
- d="m 365.61,270.68 c -3.0098,-3.3855 -3.0753,-9.6021 -0.14622,-13.885 2.9291,-4.2831 7.7435,-5.0108 10.753,-1.6253 3.0098,3.3855 3.0753,9.6021 0.1462,13.885 -2.9291,4.2831 -7.7435,5.0107 -10.753,1.6252 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68457"
- style="color:#000000;fill:url(#radialGradient7286)"
- d="m 373.05,278.59 c -3.0701,-3.8329 -2.8584,-10.54 0.47289,-14.981 3.3313,-4.4409 8.5207,-4.9337 11.591,-1.1008 3.0701,3.8329 2.8584,10.54 -0.47291,14.981 -3.3313,4.4409 -8.5207,4.9337 -11.591,1.1008 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68459"
- style="color:#000000;fill:url(#radialGradient7283)"
- d="m 381.41,285.39 c -2.8001,-4.1715 -2.1113,-10.94 1.5386,-15.119 3.6498,-4.1783 8.8785,-4.1838 11.679,-0.0123 2.8001,4.1715 2.1112,10.94 -1.5386,15.119 -3.6498,4.1783 -8.8785,4.1838 -11.679,0.0123 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68461"
- style="color:#000000;fill:url(#radialGradient7280)"
- d="m 390.22,291.41 c -2.2897,-4.7159 -0.76924,-11.509 3.3962,-15.173 4.16544,-3.664 9.3983,-2.8113 11.688,1.9046 2.2897,4.7159 0.76921,11.509 -3.3962,15.173 -4.16541,3.664 -9.3983,2.8112 -11.688,-1.9047 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68463"
- style="color:#000000;fill:url(#radialGradient7277)"
- d="m 401.04,297.59 c -2.1614,-4.5078 -0.68489,-10.974 3.2979,-14.444 3.9828,-3.4693 8.9636,-2.6274 11.125,1.8804 2.1614,4.5078 0.68487,10.974 -3.2979,14.444 -3.9828,3.4693 -8.9636,2.6274 -11.125,-1.8804 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68481"
- style="color:#000000;fill:url(#radialGradient7274)"
- d="m 347.98,213.34 c -4.1036,-0.88135 -6.9326,-5.756 -6.3188,-10.888 0.61376,-5.1319 4.4379,-8.5776 8.5414,-7.6963 4.1036,0.88136 6.9326,5.756 6.3188,10.888 -0.61376,5.1319 -4.4379,8.5776 -8.5414,7.6962 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68483"
- style="color:#000000;fill:url(#radialGradient7271)"
- d="m 348.8,220.86 c -4.1472,-0.99735 -6.9281,-6.0267 -6.2113,-11.233 0.71678,-5.2066 4.6598,-8.619 8.807,-7.6216 4.1472,0.99735 6.9281,6.0267 6.2113,11.233 -0.71678,5.2066 -4.6598,8.619 -8.807,7.6216 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68485"
- style="color:#000000;fill:url(#radialGradient7268)"
- d="m 351.5,229.88 c -3.7049,-1.3917 -5.8218,-6.3675 -4.7282,-11.114 1.0935,-4.7462 4.9834,-7.4656 8.6882,-6.0738 3.7049,1.3917 5.8218,6.3675 4.7282,11.114 -1.0935,4.7462 -4.9834,7.4656 -8.6882,6.0738 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68487"
- style="color:#000000;fill:url(#radialGradient7265)"
- d="m 355.04,239.91 c -3.9174,-1.8047 -5.9114,-7.3872 -4.4536,-12.469 1.4577,-5.0816 5.8152,-7.7381 9.7326,-5.9334 3.9174,1.8047 5.9114,7.3872 4.4536,12.469 -1.4577,5.0816 -5.8152,7.7381 -9.7326,5.9334 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68489"
- style="color:#000000;fill:url(#radialGradient7262)"
- d="m 359.27,248.05 c -3.3973,-2.234 -4.6358,-7.7204 -2.7662,-12.254 1.8696,-4.5338 6.1393,-6.3981 9.5367,-4.164 3.3973,2.234 4.6358,7.7204 2.7662,12.254 -1.8696,4.5338 -6.1393,6.398 -9.5367,4.164 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68491"
- style="color:#000000;fill:url(#radialGradient7259)"
- d="m 364.19,257.44 c -3.6288,-2.7755 -4.6662,-9.011 -2.3169,-13.927 2.3493,-4.9165 7.1955,-6.6521 10.824,-3.8766 3.6288,2.7755 4.6662,9.0111 2.3169,13.928 -2.3492,4.9165 -7.1954,6.6521 -10.824,3.8766 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68493"
- style="color:#000000;fill:url(#radialGradient7256)"
- d="m 369.49,265.03 c -3.1336,-3.5374 -3.1924,-10.022 -0.13141,-14.484 3.061,-4.4616 8.0827,-5.2109 11.216,-1.6735 3.1336,3.5374 3.1924,10.022 0.13139,14.484 -3.061,4.4616 -8.0827,5.2108 -11.216,1.6734 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68495"
- style="color:#000000;fill:url(#radialGradient7253)"
- d="m 376.97,273.14 c -3.2091,-3.4548 -3.3925,-9.9338 -0.40956,-14.471 2.9829,-4.5374 8.0025,-5.4149 11.212,-1.9601 3.2091,3.4548 3.3924,9.9338 0.40954,14.471 -2.9829,4.5374 -8.0025,5.4149 -11.212,1.96 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68497"
- style="color:#000000;fill:url(#radialGradient7250)"
- d="m 384.01,280.28 c -2.8663,-4.1235 -2.2687,-10.911 1.3347,-15.16 3.6034,-4.2493 8.8481,-4.3513 11.714,-0.22775 2.8663,4.1235 2.2687,10.911 -1.3347,15.16 -3.6034,4.2493 -8.8481,4.3512 -11.714,0.22773 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68499"
- style="color:#000000;fill:url(#radialGradient7247)"
- d="m 392.49,287.41 c -2.761,-4.3984 -1.8725,-11.348 1.9844,-15.522 3.857,-4.174 9.2219,-3.9921 11.983,0.40639 2.761,4.3984 1.8725,11.348 -1.9845,15.522 -3.857,4.174 -9.2218,3.992 -11.983,-0.40641 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68501"
- style="color:#000000;fill:url(#radialGradient7244)"
- d="m 401.6,292.94 c -2.0584,-4.7372 -0.32635,-11.324 3.8687,-14.712 4.1951,-3.3882 9.2646,-2.2946 11.323,2.4427 2.0584,4.7372 0.32632,11.324 -3.8688,14.712 -4.1951,3.3882 -9.2645,2.2945 -11.323,-2.4427 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68503"
- style="color:#000000;fill:url(#radialGradient7241)"
- d="m 411.44,299.12 c -1.8204,-5.152 0.41768,-11.905 4.9988,-15.084 4.5812,-3.1788 9.7706,-1.5791 11.591,3.573 1.8204,5.1521 -0.41771,11.906 -4.9989,15.084 -4.5812,3.1788 -9.7706,1.5791 -11.591,-3.573 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68505"
- style="color:#000000;fill:url(#radialGradient7238)"
- d="m 422.95,304.24 c -1.3568,-4.9879 1.1535,-11.128 5.6069,-13.715 4.4534,-2.5868 9.1634,-0.64024 10.52,4.3477 1.3568,4.9879 -1.1535,11.128 -5.6069,13.715 -4.4534,2.5868 -9.1634,0.64022 -10.52,-4.3477 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68521"
- style="color:#000000;fill:url(#radialGradient7235)"
- d="m 357.3,212.58 c -4.0466,-1.2207 -6.5784,-6.3668 -5.6549,-11.494 0.92345,-5.1272 4.9525,-8.2941 8.999,-7.0734 4.0466,1.2207 6.5784,6.3668 5.6549,11.494 -0.92346,5.1272 -4.9525,8.2941 -8.999,7.0734 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68523"
- style="color:#000000;fill:url(#radialGradient7232)"
- d="m 359.26,222.89 c -4.0445,-1.6185 -6.2827,-7.146 -4.9992,-12.346 1.2835,-5.2001 5.6027,-8.1036 9.6472,-6.4851 4.0445,1.6185 6.2827,7.146 4.9991,12.346 -1.2835,5.2001 -5.6027,8.1035 -9.6472,6.485 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68525"
- style="color:#000000;fill:url(#radialGradient7229)"
- d="m 362.17,232.11 c -3.7246,-1.8847 -5.4966,-7.3551 -3.9578,-12.219 1.5388,-4.8635 5.8055,-7.2783 9.5301,-5.3936 3.7246,1.8846 5.4965,7.3551 3.9578,12.219 -1.5387,4.8635 -5.8055,7.2783 -9.5301,5.3936 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68527"
- style="color:#000000;fill:url(#radialGradient7226)"
- d="m 365.34,241.25 c -3.4729,-2.5038 -4.5774,-8.3244 -2.467,-13.001 2.1104,-4.6762 6.6364,-6.4374 10.109,-3.9336 3.4729,2.5038 4.5774,8.3244 2.467,13.001 -2.1104,4.6763 -6.6364,6.4374 -10.109,3.9336 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68529"
- style="color:#000000;fill:url(#radialGradient7223)"
- d="m 369.7,249.59 c -3.0654,-2.8543 -3.5677,-8.6132 -1.1219,-12.863 2.4458,-4.2497 6.9136,-5.381 9.979,-2.5267 3.0654,2.8543 3.5677,8.6132 1.1219,12.863 -2.4458,4.2497 -6.9136,5.3809 -9.979,2.5267 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68531"
- style="color:#000000;fill:url(#radialGradient7220)"
- d="m 374.86,258.41 c -3.0513,-3.2318 -3.2646,-9.3408 -0.47657,-13.645 2.7881,-4.3041 7.5218,-5.1735 10.573,-1.9417 3.0513,3.2318 3.2646,9.3408 0.47656,13.645 -2.7881,4.3041 -7.5218,5.1734 -10.573,1.9417 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68533"
- style="color:#000000;fill:url(#radialGradient7217)"
- d="m 380.57,266.54 c -2.8608,-3.7469 -2.535,-10.166 0.72788,-14.337 3.2628,-4.1714 8.2271,-4.5154 11.088,-0.76852 2.8608,3.7469 2.535,10.166 -0.72789,14.337 -3.2628,4.1714 -8.2271,4.5154 -11.088,0.76849 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68535"
- style="color:#000000;fill:url(#radialGradient7214)"
- d="m 387.46,274.38 c -2.7471,-4.0251 -2.1207,-10.601 1.399,-14.687 3.5197,-4.0864 8.6,-4.1361 11.347,-0.111 2.7471,4.0251 2.1207,10.601 -1.399,14.687 -3.5197,4.0864 -8.6,4.1361 -11.347,0.11097 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68537"
- style="color:#000000;fill:url(#radialGradient7211)"
- d="m 395.34,281.69 c -2.5714,-4.1764 -1.6853,-10.726 1.9792,-14.628 3.6645,-3.9026 8.7198,-3.6806 11.291,0.49579 2.5714,4.1764 1.6853,10.726 -1.9792,14.628 -3.6645,3.9026 -8.7198,3.6806 -11.291,-0.49582 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68539"
- style="color:#000000;fill:url(#radialGradient7208)"
- d="m 402.79,288.13 c -2.0286,-5.0732 -0.0248,-11.955 4.4756,-15.371 4.5004,-3.4158 9.7933,-2.0722 11.822,3.001 2.0286,5.0732 0.0248,11.955 -4.4756,15.371 -4.5004,3.4158 -9.7933,2.0722 -11.822,-3.001 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68541"
- style="color:#000000;fill:url(#radialGradient7205)"
- d="m 412.34,294.81 c -1.915,-5.1756 0.2601,-12.045 4.8583,-15.342 4.5982,-3.2978 9.8783,-1.7755 11.793,3.4001 1.915,5.1756 -0.26014,12.045 -4.8584,15.342 -4.5982,3.2978 -9.8783,1.7755 -11.793,-3.4002 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68543"
- style="color:#000000;fill:url(#radialGradient7202)"
- d="m 423.25,299.88 c -1.2722,-4.8778 1.2289,-10.829 5.5864,-13.293 4.3575,-2.4636 8.9212,-0.50646 10.193,4.3713 1.2722,4.8778 -1.2289,10.829 -5.5864,13.293 -4.3575,2.4636 -8.9212,0.50644 -10.193,-4.3713 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68545"
- style="color:#000000;fill:url(#radialGradient7199)"
- d="m 434.09,305.73 c -1.0772,-5.1609 1.7967,-11.194 6.4192,-13.475 4.6225,-2.2813 9.243,0.053 10.32,5.2139 1.0772,5.1609 -1.7967,11.194 -6.4192,13.475 -4.6225,2.2813 -9.243,-0.053 -10.32,-5.2139 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68547"
- style="color:#000000;fill:url(#radialGradient7196)"
- d="m 445.05,310.29 c -0.37176,-5.8338 3.5934,-11.824 8.8565,-13.379 5.263,-1.5553 9.831,1.9131 10.203,7.7469 0.37175,5.8338 -3.5934,11.824 -8.8565,13.379 -5.2631,1.5553 -9.831,-1.9131 -10.203,-7.7469 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68559"
- style="color:#000000;fill:url(#radialGradient7193)"
- d="m 367.19,203.22 c -3.6758,-1.0481 -6.0202,-5.6641 -5.2363,-10.31 0.78386,-4.6459 4.3991,-7.5626 8.0749,-6.5144 3.6758,1.0481 6.0202,5.6641 5.2363,10.31 -0.78387,4.646 -4.3991,7.5625 -8.0749,6.5144 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68561"
- style="color:#000000;fill:url(#radialGradient7190)"
- d="m 368.34,213.91 c -3.6836,-1.4533 -5.7374,-6.4676 -4.5872,-11.2 1.1502,-4.7322 5.0687,-7.3902 8.7523,-5.9369 3.6836,1.4533 5.7373,6.4676 4.5872,11.2 -1.1502,4.7322 -5.0687,7.3902 -8.7523,5.9369 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68563"
- style="color:#000000;fill:url(#radialGradient7187)"
- d="m 370.39,224.27 c -3.7144,-1.7908 -5.5467,-7.1607 -4.0925,-11.994 1.4542,-4.8334 5.6442,-7.3 9.3587,-5.5092 3.7144,1.7908 5.5467,7.1607 4.0925,11.994 -1.4542,4.8334 -5.6442,7.3 -9.3586,5.5092 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68565"
- style="color:#000000;fill:url(#radialGradient7184)"
- d="m 372.98,233.85 c -3.5256,-2.2766 -4.8416,-7.9299 -2.9391,-12.627 1.9024,-4.6971 6.3027,-6.6592 9.8284,-4.3826 3.5256,2.2766 4.8415,7.93 2.9391,12.627 -1.9024,4.6971 -6.3027,6.6592 -9.8284,4.3826 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68567"
- style="color:#000000;fill:url(#radialGradient7181)"
- d="m 376.38,244.05 c -3.7979,-2.7836 -4.9725,-9.1927 -2.6235,-14.315 2.349,-5.1226 7.3321,-7.0187 11.13,-4.2351 3.7979,2.7836 4.9725,9.1928 2.6235,14.315 -2.349,5.1226 -7.332,7.0186 -11.13,4.2351 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68569"
- style="color:#000000;fill:url(#radialGradient7178)"
- d="m 381.12,251.84 c -3.172,-2.8776 -3.7475,-8.7636 -1.2853,-13.147 2.4622,-4.3831 7.0296,-5.6036 10.202,-2.726 3.172,2.8776 3.7475,8.7636 1.2853,13.147 -2.4622,4.3831 -7.0296,5.6036 -10.202,2.7259 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68571"
- style="color:#000000;fill:url(#radialGradient7175)"
- d="m 385.51,260.79 c -3.1385,-3.7413 -3.0519,-10.427 0.19338,-14.933 3.2453,-4.5062 8.4204,-5.1263 11.559,-1.385 3.1385,3.7413 3.0519,10.427 -0.1934,14.933 -3.2453,4.5062 -8.4204,5.1263 -11.559,1.385 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68573"
- style="color:#000000;fill:url(#radialGradient7172)"
- d="m 391.52,267.65 c -2.3829,-4.0292 -1.4452,-10.252 2.0945,-13.898 3.5397,-3.6466 8.3409,-3.3365 10.724,0.69267 2.3829,4.0291 1.4452,10.252 -2.0945,13.898 -3.5397,3.6466 -8.3409,3.3365 -10.724,-0.69269 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68575"
- style="color:#000000;fill:url(#radialGradient7169)"
- d="m 398.34,275.08 c -2.067,-4.3347 -0.63748,-10.542 3.1929,-13.864 3.8304,-3.3222 8.6111,-2.5015 10.678,1.8332 2.067,4.3347 0.63745,10.542 -3.1929,13.864 -3.8304,3.3222 -8.6111,2.5015 -10.678,-1.8332 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68577"
- style="color:#000000;fill:url(#radialGradient7166)"
- d="m 405.86,282.54 c -1.9276,-4.7115 -0.10371,-11.145 4.0739,-14.37 4.1776,-3.2251 9.1269,-2.0201 11.055,2.6914 1.9276,4.7115 0.10369,11.145 -4.0739,14.37 -4.1776,3.2251 -9.1269,2.0201 -11.055,-2.6914 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68579"
- style="color:#000000;fill:url(#radialGradient7163)"
- d="m 413.95,289.13 c -1.5251,-5.2195 1.0126,-11.748 5.668,-14.583 4.6554,-2.8342 9.6656,-0.90065 11.191,4.3188 1.5251,5.2195 -1.0126,11.748 -5.668,14.583 -4.6554,2.8342 -9.6656,0.90063 -11.191,-4.3188 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68581"
- style="color:#000000;fill:url(#radialGradient7160)"
- d="m 423.56,295.26 c -1.1561,-5.2649 1.7274,-11.476 6.4404,-13.872 4.713,-2.3964 9.4709,-0.0711 10.627,5.1938 1.1561,5.2649 -1.7274,11.476 -6.4405,13.872 -4.713,2.3964 -9.4709,0.0711 -10.627,-5.1938 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68583"
- style="color:#000000;fill:url(#radialGradient7157)"
- d="m 433.5,301.62 c -1.0173,-5.6188 2.2434,-12.035 7.283,-14.33 5.0395,-2.2955 9.9496,0.39848 10.967,6.0173 1.0173,5.6188 -2.2435,12.035 -7.283,14.33 -5.0395,2.2955 -9.9495,-0.3985 -10.967,-6.0173 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68585"
- style="color:#000000;fill:url(#radialGradient7154)"
- d="m 445.28,306.91 c -0.66044,-5.2929 2.6634,-11.045 7.424,-12.847 4.7606,-1.8021 9.1553,1.0278 9.8157,6.3208 0.66044,5.2929 -2.6634,11.045 -7.4241,12.847 -4.7606,1.8021 -9.1552,-1.0278 -9.8157,-6.3208 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68587"
- style="color:#000000;fill:url(#radialGradient7151)"
- d="m 456.56,312.25 c -0.35414,-5.7922 3.5954,-11.725 8.8216,-13.251 5.2262,-1.5261 9.75,1.9323 10.104,7.7244 0.35414,5.7922 -3.5954,11.725 -8.8216,13.251 -5.2262,1.5261 -9.7499,-1.9323 -10.104,-7.7245 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68597"
- style="color:#000000;fill:url(#radialGradient7148)"
- d="m 379.28,199.9 c -4.1002,-1.253 -6.6537,-6.4827 -5.7035,-11.681 0.95023,-5.1982 5.0444,-8.3965 9.1446,-7.1435 4.1002,1.253 6.6537,6.4827 5.7035,11.681 -0.95023,5.1982 -5.0444,8.3964 -9.1446,7.1435 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68599"
- style="color:#000000;fill:url(#radialGradient7145)"
- d="m 378.27,205.37 c -3.7001,-1.2808 -5.8944,-6.1448 -4.9011,-10.864 0.9933,-4.7194 4.7981,-7.507 8.4982,-6.2262 3.7001,1.2808 5.8944,6.1449 4.9011,10.864 -0.99331,4.7194 -4.798,7.507 -8.4982,6.2262 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68601"
- style="color:#000000;fill:url(#radialGradient7142)"
- d="m 378.93,215.79 c -3.5278,-1.9877 -5.0574,-7.3645 -3.4165,-12.009 1.6409,-4.6449 5.8308,-6.7989 9.3586,-4.8112 3.5277,1.9878 5.0574,7.3646 3.4165,12.009 -1.6409,4.6449 -5.8308,6.7989 -9.3586,4.8111 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68603"
- style="color:#000000;fill:url(#radialGradient7139)"
- d="m 380.91,226.88 c -3.8967,-2.3942 -5.4406,-8.5247 -3.4485,-13.693 1.9922,-5.1683 6.766,-7.4171 10.663,-5.023 3.8967,2.3942 5.4406,8.5248 3.4484,13.693 -1.9922,5.1683 -6.766,7.4171 -10.663,5.0229 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68605"
- style="color:#000000;fill:url(#radialGradient7136)"
- d="m 383.62,236.24 c -3.6132,-2.793 -4.6245,-9.03 -2.2587,-13.931 2.3658,-4.9008 7.2127,-6.6097 10.826,-3.8167 3.6132,2.793 4.6244,9.03 2.2587,13.931 -2.3658,4.9008 -7.2127,6.6096 -10.826,3.8167 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68607"
- style="color:#000000;fill:url(#radialGradient7133)"
- d="m 386.52,244.94 c -3.1294,-3.5612 -3.1672,-10.064 -0.0845,-14.526 3.0827,-4.4611 8.1186,-5.1906 11.248,-1.6294 3.1294,3.5612 3.1672,10.064 0.0845,14.526 -3.0827,4.4611 -8.1186,5.1905 -11.248,1.6294 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68609"
- style="color:#000000;fill:url(#radialGradient7130)"
- d="m 391.1,253.2 c -2.7081,-3.7731 -2.2336,-10.068 1.0598,-14.059 3.2934,-3.9915 8.1586,-4.1685 10.867,-0.39536 2.7081,3.7731 2.2335,10.068 -1.0599,14.059 -3.2934,3.9915 -8.1586,4.1685 -10.867,0.39533 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68611"
- style="color:#000000;fill:url(#radialGradient7127)"
- d="m 396.43,261.79 c -2.6052,-4.0374 -1.8497,-10.486 1.6876,-14.403 3.5372,-3.9171 8.5167,-3.8196 11.122,0.21787 2.6052,4.0374 1.8496,10.486 -1.6876,14.403 -3.5372,3.9171 -8.5166,3.8196 -11.122,-0.21789 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68613"
- style="color:#000000;fill:url(#radialGradient7124)"
- d="m 402.12,270.31 c -2.593,-4.5776 -1.4308,-11.535 2.5958,-15.539 4.0266,-4.0046 9.3928,-3.5402 11.986,1.0373 2.593,4.5776 1.4308,11.535 -2.5958,15.539 -4.0266,4.0046 -9.3928,3.5402 -11.986,-1.0374 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68615"
- style="color:#000000;fill:url(#radialGradient7121)"
- d="m 409.23,277.87 c -2.371,-4.7116 -0.92254,-11.58 3.2353,-15.342 4.1578,-3.7616 9.4506,-2.9914 11.822,1.7202 2.371,4.7116 0.92252,11.58 -3.2353,15.342 -4.1579,3.7615 -9.4506,2.9914 -11.822,-1.7202 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68617"
- style="color:#000000;fill:url(#radialGradient7118)"
- d="m 416.41,284.3 c -1.7111,-5.269 0.70533,-12.028 5.3972,-15.097 4.6919,-3.0687 9.8825,-1.285 11.594,3.984 1.7111,5.269 -0.70536,12.028 -5.3972,15.097 -4.6919,3.0687 -9.8824,1.285 -11.594,-3.984 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68619"
- style="color:#000000;fill:url(#radialGradient7115)"
- d="m 425.9,290.71 c -1.3755,-4.8828 1.0418,-10.94 5.3992,-13.53 4.3574,-2.5894 9.0048,-0.73036 10.38,4.1524 1.3755,4.8828 -1.0419,10.94 -5.3992,13.53 -4.3574,2.5894 -9.0047,0.73035 -10.38,-4.1524 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68621"
- style="color:#000000;fill:url(#radialGradient7112)"
- d="m 434.2,296.92 c -0.89915,-5.7573 2.5632,-12.191 7.7334,-14.37 5.1702,-2.1789 10.09,0.72201 10.99,6.4794 0.89915,5.7573 -2.5633,12.191 -7.7335,14.37 -5.1702,2.1789 -10.09,-0.72203 -10.99,-6.4794 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68623"
- style="color:#000000;fill:url(#radialGradient7109)"
- d="m 444.84,302.55 c -0.49636,-5.6479 3.2269,-11.581 8.3161,-13.252 5.0892,-1.6708 9.6172,1.5532 10.114,7.2011 0.49635,5.6479 -3.2269,11.581 -8.3162,13.252 -5.0892,1.6708 -9.6172,-1.5533 -10.114,-7.2012 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68625"
- style="color:#000000;fill:url(#radialGradient7106)"
- d="m 455.5,307.46 c 0.16461,-6.0128 4.7154,-11.649 10.165,-12.59 5.4491,-0.94027 9.7331,3.1718 9.5685,9.1847 -0.16462,6.0128 -4.7155,11.649 -10.165,12.59 -5.4491,0.94026 -9.733,-3.1719 -9.5684,-9.1847 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68627"
- style="color:#000000;fill:url(#radialGradient7103)"
- d="m 468.05,312.66 c 0.393,-5.7067 4.9127,-10.824 10.095,-11.43 5.1823,-0.60594 9.0649,3.5291 8.6719,9.2358 -0.39301,5.7067 -4.9127,10.824 -10.095,11.43 -5.1823,0.60594 -9.0648,-3.5291 -8.6718,-9.2358 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68637"
- style="color:#000000;fill:url(#radialGradient7100)"
- d="m 388.15,197.36 c -4.0474,-1.6739 -6.2475,-7.2577 -4.914,-12.472 1.3335,-5.2142 5.6956,-8.0841 9.7431,-6.4102 4.0474,1.6739 6.2475,7.2577 4.914,12.472 -1.3335,5.2142 -5.6956,8.0841 -9.7431,6.4102 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68639"
- style="color:#000000;fill:url(#radialGradient7097)"
- d="m 388.06,207.76 c -3.6972,-2.3319 -5.1178,-8.2067 -3.1731,-13.122 1.9447,-4.9151 6.5184,-7.0092 10.216,-4.6773 3.6972,2.3319 5.1178,8.2067 3.1731,13.122 -1.9447,4.915 -6.5184,7.0091 -10.216,4.6772 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68641"
- style="color:#000000;fill:url(#radialGradient7094)"
- d="m 390.05,217.85 c -3.515,-2.1889 -4.8863,-7.7472 -3.0628,-12.415 1.8235,-4.6676 6.1512,-6.677 9.6662,-4.4881 3.515,2.1889 4.8863,7.7472 3.0628,12.415 -1.8235,4.6676 -6.1512,6.677 -9.6662,4.4881 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68643"
- style="color:#000000;fill:url(#radialGradient7091)"
- d="m 391.7,227.91 c -3.36,-2.7725 -4.1719,-8.7414 -1.8133,-13.332 2.3586,-4.5907 6.9944,-6.0646 10.354,-3.2922 3.36,2.7725 4.1719,8.7414 1.8133,13.332 -2.3586,4.5907 -6.9944,6.0646 -10.354,3.2921 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68645"
- style="color:#000000;fill:url(#radialGradient7088)"
- d="m 394.61,237.72 c -3.3158,-3.0586 -3.8804,-9.26 -1.2609,-13.851 2.6195,-4.5914 7.431,-5.834 10.747,-2.7755 3.3158,3.0586 3.8804,9.2601 1.2609,13.851 -2.6195,4.5914 -7.431,5.834 -10.747,2.7755 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68647"
- style="color:#000000;fill:url(#radialGradient7085)"
- d="m 397.92,246.36 c -2.8495,-3.5689 -2.6446,-9.8052 0.45771,-13.929 3.1023,-4.1239 7.9271,-4.5738 10.777,-1.0048 2.8495,3.5689 2.6445,9.8052 -0.45773,13.929 -3.1023,4.1239 -7.9271,4.5737 -10.777,1.0048 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68649"
- style="color:#000000;fill:url(#radialGradient7082)"
- d="m 402.12,255.12 c -2.6171,-4.0371 -1.8719,-10.497 1.6645,-14.428 3.5364,-3.9314 8.5248,-3.8458 11.142,0.19129 2.6171,4.0371 1.8719,10.497 -1.6645,14.428 -3.5364,3.9314 -8.5248,3.8458 -11.142,-0.19132 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68651"
- style="color:#000000;fill:url(#radialGradient7079)"
- d="m 407.8,263.4 c -2.4082,-4.0672 -1.4638,-10.351 2.1092,-14.035 3.573,-3.6844 8.4218,-3.374 10.83,0.6933 2.4082,4.0672 1.4638,10.351 -2.1092,14.036 -3.573,3.6843 -8.4217,3.3739 -10.83,-0.69333 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68653"
- style="color:#000000;fill:url(#radialGradient7076)"
- d="m 413.66,271.54 c -2.238,-4.4931 -0.83705,-11.021 3.129,-14.58 3.9661,-3.5591 8.9954,-2.802 11.233,1.6911 2.238,4.4931 0.83702,11.021 -3.129,14.58 -3.9661,3.5591 -8.9954,2.802 -11.233,-1.6911 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68655"
- style="color:#000000;fill:url(#radialGradient7073)"
- d="m 419.95,279.32 c -2.0292,-5.145 0.0268,-12.097 4.5923,-15.527 4.5654,-3.4301 9.9114,-2.0399 11.941,3.1052 2.0292,5.145 -0.0269,12.097 -4.5923,15.527 -4.5654,3.4301 -9.9114,2.0398 -11.941,-3.1052 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68657"
- style="color:#000000;fill:url(#radialGradient7070)"
- d="m 427.64,285.01 c -1.0733,-5.3568 1.9478,-11.575 6.7477,-13.889 4.8,-2.3137 9.5612,0.15328 10.634,5.5101 1.0733,5.3568 -1.9478,11.575 -6.7478,13.889 -4.8,2.3137 -9.5611,-0.15329 -10.634,-5.5101 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68659"
- style="color:#000000;fill:url(#radialGradient7067)"
- d="m 436.57,292.61 c -1.2389,-5.3686 1.6505,-11.761 6.4537,-14.277 4.8032,-2.5163 9.7014,-0.20406 10.94,5.1646 1.2389,5.3686 -1.6505,11.761 -6.4538,14.277 -4.8032,2.5163 -9.7013,0.20405 -10.94,-5.1646 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68661"
- style="color:#000000;fill:url(#radialGradient7064)"
- d="m 446.42,298.51 c -0.78665,-5.2534 2.4012,-11.091 7.1204,-13.038 4.7192,-1.9473 9.1825,0.73282 9.9692,5.9862 0.78665,5.2534 -2.4013,11.091 -7.1204,13.038 -4.7192,1.9473 -9.1825,-0.73283 -9.9691,-5.9862 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68663"
- style="color:#000000;fill:url(#radialGradient7061)"
- d="m 456.33,303.94 c -0.20993,-5.594 3.7164,-11.194 8.7696,-12.508 5.0532,-1.314 9.3199,2.1555 9.5298,7.7495 0.20993,5.594 -3.7164,11.194 -8.7696,12.508 -5.0533,1.314 -9.3199,-2.1555 -9.5298,-7.7495 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68665"
- style="color:#000000;fill:url(#radialGradient7058)"
- d="m 467.75,308.98 c 0.30482,-5.4894 4.5904,-10.484 9.5721,-11.155 4.9817,-0.67144 8.7731,3.2343 8.4683,8.7237 -0.30483,5.4894 -4.5904,10.484 -9.5721,11.155 -4.9817,0.67144 -8.7731,-3.2343 -8.4682,-8.7237 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68667"
- style="color:#000000;fill:url(#radialGradient7055)"
- d="m 478.63,313.87 c 0.86319,-6.225 6.1613,-11.381 11.834,-11.516 5.6724,-0.13527 9.5711,4.8014 8.7079,11.026 -0.86318,6.225 -6.1614,11.381 -11.834,11.516 -5.6724,0.13526 -9.571,-4.8014 -8.7078,-11.026 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68675"
- style="color:#000000;fill:url(#radialGradient7052)"
- d="m 400.84,190.33 c -4.0324,-1.4979 -6.3488,-6.8973 -5.1739,-12.06 1.1749,-5.1626 5.3963,-8.1335 9.4287,-6.6356 4.0324,1.4979 6.3488,6.8973 5.1739,12.06 -1.1749,5.1626 -5.3963,8.1334 -9.4287,6.6355 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68677"
- style="color:#000000;fill:url(#radialGradient7049)"
- d="m 398.87,198.57 c -3.5884,-2.1021 -5.0855,-7.6486 -3.3439,-12.389 1.7416,-4.7399 6.0625,-6.8784 9.6509,-4.7763 3.5884,2.1021 5.0855,7.6487 3.3439,12.389 -1.7416,4.7399 -6.0625,6.8783 -9.6509,4.7762 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68679"
- style="color:#000000;fill:url(#radialGradient7046)"
- d="m 398.9,209.77 c -3.6301,-2.7157 -4.7123,-8.8949 -2.4172,-13.802 2.2951,-4.9067 7.0985,-6.6828 10.729,-3.967 3.6301,2.7157 4.7123,8.8949 2.4172,13.802 -2.2951,4.9067 -7.0985,6.6827 -10.729,3.967 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68681"
- style="color:#000000;fill:url(#radialGradient7043)"
- d="m 399.96,220.17 c -3.4919,-3.1636 -4.1285,-9.6392 -1.4218,-14.464 2.7067,-4.8244 7.7316,-6.1707 11.224,-3.007 3.4919,3.1636 4.1285,9.6392 1.4218,14.464 -2.7067,4.8244 -7.7316,6.1706 -11.224,3.007 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68683"
- style="color:#000000;fill:url(#radialGradient7040)"
- d="m 402.44,230.47 c -3.5401,-3.2305 -4.1684,-9.8178 -1.4034,-14.713 2.765,-4.8953 7.8764,-6.245 11.416,-3.0145 3.5401,3.2305 4.1684,9.8178 1.4034,14.713 -2.765,4.8953 -7.8764,6.2449 -11.416,3.0144 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68685"
- style="color:#000000;fill:url(#radialGradient7037)"
- d="m 405.26,239.61 c -3.1724,-3.555 -3.2512,-10.094 -0.17596,-14.606 3.0752,-4.5119 8.1399,-5.2876 11.312,-1.7326 3.1724,3.555 3.2511,10.095 0.17594,14.606 -3.0752,4.5119 -8.1398,5.2876 -11.312,1.7326 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68687"
- style="color:#000000;fill:url(#radialGradient7034)"
- d="m 408.8,247.97 c -2.595,-3.9108 -1.9237,-10.227 1.4994,-14.108 3.4231,-3.8808 8.3017,-3.8564 10.897,0.0544 2.595,3.9108 1.9237,10.227 -1.4994,14.108 -3.4231,3.8808 -8.3017,3.8564 -10.897,-0.0544 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68689"
- style="color:#000000;fill:url(#radialGradient7031)"
- d="m 412.8,257.37 c -2.6473,-4.5219 -1.572,-11.479 2.4018,-15.539 3.9738,-4.0598 9.3413,-3.6853 11.989,0.8366 2.6473,4.5219 1.572,11.479 -2.4018,15.539 -3.9738,4.0598 -9.3412,3.6853 -11.989,-0.83663 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68691"
- style="color:#000000;fill:url(#radialGradient7028)"
- d="m 418.67,265.19 c -2.2427,-4.423 -0.8973,-10.888 3.0051,-14.439 3.9024,-3.5516 8.884,-2.8452 11.127,1.5778 2.2427,4.423 0.89727,10.888 -3.0052,14.439 -3.9024,3.5516 -8.884,2.8452 -11.127,-1.5778 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68693"
- style="color:#000000;fill:url(#radialGradient7025)"
- d="m 423.97,272.28 c -1.5139,-5.1574 0.98756,-11.615 5.5873,-14.424 4.59974,-2.809 9.5558,-0.90531 11.07,4.2521 1.5139,5.1574 -0.98759,11.615 -5.5873,14.424 -4.59971,2.809 -9.5558,0.90529 -11.07,-4.2521 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68695"
- style="color:#000000;fill:url(#radialGradient7022)"
- d="m 430.74,279.81 c -1.2424,-5.5013 1.7413,-12.025 6.6645,-14.57 4.9232,-2.5457 9.9214,-0.14975 11.164,5.3516 1.2424,5.5013 -1.7414,12.025 -6.6645,14.57 -4.9232,2.5457 -9.9213,0.14973 -11.164,-5.3516 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68697"
- style="color:#000000;fill:url(#radialGradient7019)"
- d="m 439,286.93 c -1.0245,-5.4044 2.0729,-11.621 6.9181,-13.884 4.8452,-2.2636 9.6036,0.2825 10.628,5.687 1.0245,5.4044 -2.0729,11.621 -6.9182,13.884 -4.8452,2.2636 -9.6036,-0.28252 -10.628,-5.687 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68699"
- style="color:#000000;fill:url(#radialGradient7016)"
- d="m 447.06,293.46 c -0.58789,-5.9263 3.262,-12.217 8.5991,-14.052 5.3371,-1.8343 10.14,1.4829 10.728,7.4091 0.58789,5.9263 -3.2621,12.217 -8.5992,14.052 -5.3371,1.8343 -10.14,-1.4829 -10.728,-7.4092 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68701"
- style="color:#000000;fill:url(#radialGradient7013)"
- d="m 457.3,298.77 c 0.0946,-5.5488 4.2457,-10.806 9.2717,-11.743 5.026,-0.93699 9.0237,2.8016 8.929,8.3504 -0.0946,5.5488 -4.2457,10.806 -9.2717,11.743 -5.026,0.93699 -9.0236,-2.8016 -8.929,-8.3504 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68703"
- style="color:#000000;fill:url(#radialGradient7010)"
- d="m 467.07,304.66 c 0.47624,-5.9951 5.278,-11.309 10.725,-11.869 5.447,-0.55988 9.4767,3.8462 9.0005,9.8414 -0.47624,5.9951 -5.278,11.309 -10.725,11.869 -5.447,0.55988 -9.4767,-3.8462 -9.0004,-9.8414 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68705"
- style="color:#000000;fill:url(#radialGradient7007)"
- d="m 478.36,309.51 c 1.0944,-5.9597 6.3938,-10.633 11.837,-10.438 5.4427,0.19479 8.9677,5.184 7.8732,11.144 -1.0944,5.9597 -6.3938,10.633 -11.837,10.438 -5.4427,-0.19479 -8.9676,-5.184 -7.8732,-11.144 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68707"
- style="color:#000000;fill:url(#radialGradient7004)"
- d="m 490.39,314.94 c 1.2705,-5.9917 6.7426,-10.523 12.222,-10.122 5.4796,0.40176 8.8917,5.5847 7.6212,11.576 -1.2705,5.9917 -6.7426,10.523 -12.222,10.122 -5.4796,-0.40176 -8.8917,-5.5847 -7.6212,-11.576 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68715"
- style="color:#000000;fill:url(#radialGradient7001)"
- d="m 410.23,189.7 c -3.7808,-2.0434 -5.4839,-7.722 -3.804,-12.684 1.6799,-4.9616 6.1067,-7.3272 9.8875,-5.2838 3.7808,2.0434 5.4839,7.7221 3.804,12.684 -1.6799,4.9616 -6.1066,7.3272 -9.8875,5.2838 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68717"
- style="color:#000000;fill:url(#radialGradient6998)"
- d="m 409.87,200.89 c -3.6877,-2.3921 -5.056,-8.3157 -3.0564,-13.231 1.9997,-4.915 6.6102,-6.9602 10.298,-4.568 3.6877,2.3921 5.056,8.3157 3.0564,13.231 -1.9997,4.915 -6.6102,6.9601 -10.298,4.568 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68719"
- style="color:#000000;fill:url(#radialGradient6995)"
- d="m 409.93,211.47 c -3.4369,-2.9597 -4.1765,-9.1847 -1.6519,-13.904 2.5246,-4.7192 7.3574,-6.1454 10.794,-3.1857 3.4369,2.9597 4.1765,9.1847 1.6518,13.904 -2.5246,4.7191 -7.3574,6.1454 -10.794,3.1857 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68721"
- style="color:#000000;fill:url(#radialGradient6992)"
- d="m 411.29,222.32 c -3.5408,-3.2398 -4.1628,-9.8366 -1.3894,-14.735 2.7734,-4.8979 7.8921,-6.242 11.433,-3.0022 3.5408,3.2398 4.1628,9.8367 1.3894,14.735 -2.7734,4.8979 -7.892,6.242 -11.433,3.0022 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68723"
- style="color:#000000;fill:url(#radialGradient6989)"
- d="m 413.42,230.89 c -2.7452,-3.4684 -2.5257,-9.5053 0.49024,-13.484 3.0159,-3.9786 7.6862,-4.3923 10.431,-0.92391 2.7452,3.4684 2.5257,9.5054 -0.49026,13.484 -3.0159,3.9786 -7.6862,4.3922 -10.431,0.92388 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68725"
- style="color:#000000;fill:url(#radialGradient6986)"
- d="m 415.77,241.08 c -2.8124,-4.1235 -2.1693,-10.858 1.4365,-15.042 3.6058,-4.1841 8.8088,-4.2333 11.621,-0.10987 2.8124,4.1235 2.1693,10.858 -1.4365,15.042 -3.6058,4.1842 -8.8088,4.2333 -11.621,0.10985 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68727"
- style="color:#000000;fill:url(#radialGradient6983)"
- d="m 419.99,249.36 c -2.2746,-4.0516 -1.2286,-10.189 2.3363,-13.709 3.5649,-3.5198 8.2987,-3.0886 10.573,0.96301 2.2746,4.0516 1.2286,10.189 -2.3363,13.709 -3.5649,3.5198 -8.2987,3.0886 -10.573,-0.96303 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68729"
- style="color:#000000;fill:url(#radialGradient6980)"
- d="m 423.31,258.15 c -1.9628,-5.0685 0.0934,-11.881 4.5925,-15.216 4.4991,-3.3352 9.7376,-1.9301 11.7,3.1384 1.9628,5.0685 -0.0934,11.881 -4.5925,15.216 -4.4991,3.3352 -9.7375,1.9301 -11.7,-3.1384 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68731"
- style="color:#000000;fill:url(#radialGradient6977)"
- d="m 429.19,266.29 c -1.7133,-4.9698 0.48175,-11.442 4.9027,-14.457 4.421,-3.0146 9.3938,-1.4297 11.107,3.5401 1.7133,4.9698 -0.48178,11.442 -4.9028,14.457 -4.421,3.0146 -9.3937,1.4297 -11.107,-3.5401 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68733"
- style="color:#000000;fill:url(#radialGradient6974)"
- d="m 434.77,273.87 c -1.2478,-5.5482 1.7658,-12.122 6.7312,-14.683 4.9653,-2.5611 10.002,-0.13955 11.25,5.4087 1.2478,5.5482 -1.7659,12.122 -6.7312,14.683 -4.9653,2.5611 -10.002,0.13953 -11.25,-5.4087 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68735"
- style="color:#000000;fill:url(#radialGradient6971)"
- d="m 442.53,281.43 c -1.0961,-5.2698 1.8417,-11.426 6.5619,-13.751 4.7202,-2.3248 9.4352,0.0626 10.531,5.3324 1.0961,5.2698 -1.8418,11.426 -6.562,13.751 -4.7202,2.3248 -9.4352,-0.0626 -10.531,-5.3324 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68737"
- style="color:#000000;fill:url(#radialGradient6968)"
- d="m 450.33,288.4 c -0.75305,-5.4605 2.6152,-11.464 7.5233,-13.41 4.9081,-1.9459 9.4974,0.90327 10.25,6.3637 0.75305,5.4604 -2.6153,11.464 -7.5234,13.41 -4.9081,1.9459 -9.4973,-0.90328 -10.25,-6.3637 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68739"
- style="color:#000000;fill:url(#radialGradient6965)"
- d="m 458.95,294.29 c -0.0831,-5.6056 3.9591,-11.092 9.0285,-12.255 5.0694,-1.1628 9.2464,2.4388 9.3295,8.0443 0.0831,5.6056 -3.9591,11.092 -9.0286,12.255 -5.0694,1.1628 -9.2464,-2.4388 -9.3295,-8.0443 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68741"
- style="color:#000000;fill:url(#radialGradient6962)"
- d="m 468.76,300 c 0.46432,-5.5099 4.9,-10.368 9.9074,-10.85 5.0074,-0.48235 8.6903,3.5933 8.226,9.1032 -0.46432,5.5099 -4.9,10.368 -9.9074,10.85 -5.0074,0.48235 -8.6902,-3.5933 -8.2259,-9.1032 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68743"
- style="color:#000000;fill:url(#radialGradient6959)"
- d="m 478.89,306.43 c 0.54556,-5.7458 5.2232,-10.751 10.448,-11.18 5.2246,-0.42877 9.0177,3.8816 8.4721,9.6274 -0.54556,5.7458 -5.2232,10.751 -10.448,11.18 -5.2246,0.42877 -9.0176,-3.8816 -8.4721,-9.6274 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68745"
- style="color:#000000;fill:url(#radialGradient6956)"
- d="m 489.78,311.57 c 1.0725,-5.9758 6.3652,-10.686 11.821,-10.521 5.4563,0.16523 9.01,5.1435 7.9375,11.119 -1.0725,5.9758 -6.3652,10.686 -11.821,10.521 -5.4563,-0.16523 -9.01,-5.1435 -7.9375,-11.119 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68747"
- style="color:#000000;fill:url(#radialGradient6953)"
- d="m 501.72,315.8 c 1.8258,-6.0262 7.7934,-10.046 13.329,-8.9794 5.5357,1.067 8.5432,6.8172 6.7174,12.843 -1.8258,6.0262 -7.7934,10.046 -13.329,8.9794 -5.5357,-1.067 -8.5431,-6.8172 -6.7173,-12.843 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68753"
- style="color:#000000;fill:url(#radialGradient6950)"
- d="m 422.56,179.81 c -3.6778,-1.8526 -5.4336,-7.2462 -3.9218,-12.047 1.5118,-4.8008 5.7188,-7.1907 9.3966,-5.3381 3.6778,1.8526 5.4336,7.2462 3.9218,12.047 -1.5118,4.8008 -5.7188,7.1907 -9.3966,5.3381 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68755"
- style="color:#000000;fill:url(#radialGradient6947)"
- d="m 420.92,191.44 c -3.5681,-2.5035 -4.7535,-8.4171 -2.6477,-13.208 2.1058,-4.7914 6.7054,-6.6462 10.273,-4.1427 3.5681,2.5035 4.7535,8.4171 2.6477,13.209 -2.1058,4.7914 -6.7054,6.6461 -10.273,4.1427 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68757"
- style="color:#000000;fill:url(#radialGradient6944)"
- d="m 420.28,202.81 c -3.5311,-3.0327 -4.297,-9.4204 -1.7105,-14.267 2.5864,-4.847 7.5456,-6.3177 11.077,-3.285 3.5311,3.0327 4.2969,9.4204 1.7105,14.267 -2.5864,4.847 -7.5456,6.3177 -11.077,3.285 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68759"
- style="color:#000000;fill:url(#radialGradient6941)"
- d="m 421.01,213.88 c -3.5854,-3.2035 -4.2719,-9.8092 -1.5333,-14.754 2.7386,-4.945 7.8652,-6.3568 11.451,-3.1533 3.5854,3.2035 4.2719,9.8092 1.5333,14.754 -2.7386,4.945 -7.8652,6.3568 -11.451,3.1533 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68761"
- style="color:#000000;fill:url(#radialGradient6938)"
- d="m 422.24,223.67 c -3.177,-3.5301 -3.278,-10.05 -0.22556,-14.563 3.0524,-4.5128 8.1024,-5.3094 11.279,-1.7794 3.177,3.5301 3.278,10.05 0.22554,14.563 -3.0524,4.5128 -8.1024,5.3094 -11.279,1.7793 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68763"
- style="color:#000000;fill:url(#radialGradient6935)"
- d="m 423.83,232.43 c -2.4092,-4.0979 -1.4432,-10.412 2.1575,-14.104 3.6007,-3.6914 8.4727,-3.3618 10.882,0.73607 2.4092,4.0979 1.4432,10.412 -2.1575,14.104 -3.6007,3.6914 -8.4727,3.3618 -10.882,-0.73609 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68765"
- style="color:#000000;fill:url(#radialGradient6932)"
- d="m 426.5,242.57 c -2.4924,-4.5525 -1.2635,-11.387 2.745,-15.265 4.0085,-3.8783 9.2785,-3.3317 11.771,1.2208 2.4924,4.5525 1.2634,11.387 -2.745,15.265 -4.0085,3.8783 -9.2785,3.3317 -11.771,-1.2209 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68767"
- style="color:#000000;fill:url(#radialGradient6929)"
- d="m 430.57,250.9 c -1.9596,-4.576 -0.26202,-10.911 3.7916,-14.149 4.05362,-3.238 8.9282,-2.1533 10.888,2.4227 1.9596,4.576 0.26199,10.911 -3.7916,14.149 -4.05359,3.238 -8.9282,2.1533 -10.888,-2.4227 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68769"
- style="color:#000000;fill:url(#radialGradient6926)"
- d="m 435.08,259.84 c -1.8472,-4.8545 0.14978,-11.347 4.4604,-14.502 4.3106,-3.1548 9.3025,-1.777 11.15,3.0774 1.8472,4.8544 -0.1498,11.347 -4.4604,14.502 -4.3106,3.1548 -9.3025,1.777 -11.15,-3.0774 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68771"
- style="color:#000000;fill:url(#radialGradient6923)"
- d="m 440.46,266.94 c -1.0529,-5.0296 1.7454,-10.912 6.2501,-13.139 4.5047,-2.227 9.0101,0.045 10.063,5.0746 1.0529,5.0296 -1.7454,10.912 -6.2502,13.139 -4.5047,2.227 -9.0101,-0.045 -10.063,-5.0746 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68773"
- style="color:#000000;fill:url(#radialGradient6920)"
- d="m 446.59,275.57 c -1.1402,-5.3039 1.7853,-11.537 6.5344,-13.921 4.7491,-2.3846 9.5233,-0.0181 10.664,5.2858 1.1402,5.3039 -1.7854,11.537 -6.5344,13.921 -4.7491,2.3846 -9.5233,0.0181 -10.663,-5.2858 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68775"
- style="color:#000000;fill:url(#radialGradient6917)"
- d="m 453.41,282.29 c -0.49073,-5.5878 3.1932,-11.457 8.2283,-13.11 5.0351,-1.6526 9.5147,1.5375 10.005,7.1253 0.49073,5.5878 -3.1932,11.457 -8.2284,13.11 -5.0351,1.6526 -9.5147,-1.5375 -10.005,-7.1253 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68777"
- style="color:#000000;fill:url(#radialGradient6914)"
- d="m 461.1,289.73 c -0.35965,-5.8585 3.6339,-11.861 8.9199,-13.406 5.286,-1.5453 9.8627,1.9512 10.222,7.8098 0.35964,5.8585 -3.634,11.861 -8.92,13.406 -5.286,1.5453 -9.8627,-1.9512 -10.222,-7.8098 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68779"
- style="color:#000000;fill:url(#radialGradient6911)"
- d="m 470.03,295.86 c 0.16619,-5.817 4.5747,-11.263 9.8466,-12.164 5.272,-0.90124 9.411,3.0838 9.2448,8.9008 -0.16619,5.817 -4.5747,11.263 -9.8467,12.164 -5.272,0.90125 -9.411,-3.0838 -9.2448,-8.9008 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68781"
- style="color:#000000;fill:url(#radialGradient6908)"
- d="m 479.27,301.24 c 0.92858,-6.07 6.1684,-11.012 11.704,-11.039 5.5351,-0.0268 9.2695,4.8722 8.3409,10.942 -0.92859,6.07 -6.1685,11.012 -11.704,11.039 -5.5351,0.0268 -9.2694,-4.8722 -8.3408,-10.942 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68783"
- style="color:#000000;fill:url(#radialGradient6905)"
- d="m 489.83,306.78 c 1.384,-6.0098 6.9655,-10.448 12.467,-9.9119 5.5011,0.53564 8.8386,5.8418 7.4546,11.852 -1.384,6.0098 -6.9655,10.448 -12.467,9.9119 -5.5011,-0.53565 -8.8386,-5.8418 -7.4546,-11.852 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68785"
- style="color:#000000;fill:url(#radialGradient6902)"
- d="m 500.85,312.76 c 1.5004,-6.1816 7.3065,-10.671 12.968,-10.027 5.6617,0.64396 9.0351,6.1772 7.5347,12.359 -1.5004,6.1816 -7.3065,10.671 -12.968,10.027 -5.6617,-0.64396 -9.0351,-6.1772 -7.5346,-12.359 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68787"
- style="color:#000000;fill:url(#radialGradient6899)"
- d="m 513.86,316.73 c 2.2603,-5.5531 8.2488,-8.6908 13.376,-7.0084 5.1269,1.6824 7.4508,7.5479 5.1905,13.101 -2.2603,5.5531 -8.2488,8.6908 -13.376,7.0084 -5.1269,-1.6824 -7.4508,-7.5479 -5.1905,-13.101 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68793"
- style="color:#000000;fill:url(#radialGradient6896)"
- d="m 432.66,181.6 c -3.4301,-2.6845 -4.3659,-8.6374 -2.09,-13.296 2.2758,-4.6588 6.9014,-6.2593 10.332,-3.5748 3.4301,2.6845 4.3659,8.6374 2.09,13.296 -2.2758,4.6588 -6.9014,6.2593 -10.332,3.5747 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68795"
- style="color:#000000;fill:url(#radialGradient6893)"
- d="m 431.83,192.79 c -3.1983,-2.8166 -3.8408,-8.6696 -1.435,-13.073 2.4058,-4.4034 6.9488,-5.6897 10.147,-2.8731 3.1983,2.8166 3.8408,8.6696 1.435,13.073 -2.4058,4.4034 -6.9488,5.6897 -10.147,2.8731 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68797"
- style="color:#000000;fill:url(#radialGradient6890)"
- d="m 431.19,204.64 c -3.3862,-3.3654 -3.7851,-9.9317 -0.89115,-14.666 2.894,-4.7346 7.9851,-5.8446 11.371,-2.4793 3.3862,3.3654 3.7851,9.9317 0.89113,14.666 -2.894,4.7346 -7.985,5.8446 -11.371,2.4792 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68799"
- style="color:#000000;fill:url(#radialGradient6887)"
- d="m 431.59,214.08 c -2.6404,-3.6872 -2.1716,-9.8324 1.0471,-13.726 3.2187,-3.8933 7.9684,-4.0604 10.609,-0.37318 2.6404,3.6872 2.1716,9.8324 -1.0471,13.726 -3.2187,3.8933 -7.9683,4.0604 -10.609,0.37316 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68801"
- style="color:#000000;fill:url(#radialGradient6884)"
- d="m 432.87,224.21 c -2.3973,-3.9868 -1.5028,-10.182 1.9979,-13.838 3.5007,-3.656 8.282,-3.3878 10.679,0.59897 2.3973,3.9868 1.5028,10.182 -1.9979,13.838 -3.5007,3.656 -8.282,3.3878 -10.679,-0.599 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68803"
- style="color:#000000;fill:url(#radialGradient6881)"
- d="m 435.51,234.59 c -2.5044,-3.9597 -1.7204,-10.234 1.751,-14.015 3.4714,-3.7804 8.3158,-3.635 10.82,0.32477 2.5044,3.9597 1.7204,10.234 -1.751,14.015 -3.4714,3.7804 -8.3158,3.635 -10.82,-0.32479 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68805"
- style="color:#000000;fill:url(#radialGradient6878)"
- d="m 438.27,243.49 c -2.0148,-4.3117 -0.55802,-10.446 3.2539,-13.7 3.8119,-3.2548 8.5354,-2.398 10.55,1.9137 2.0148,4.3117 0.558,10.446 -3.2539,13.7 -3.8119,3.2548 -8.5354,2.398 -10.55,-1.9137 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68807"
- style="color:#000000;fill:url(#radialGradient6875)"
- d="m 441.34,252.64 c -1.7594,-4.9862 0.40862,-11.52 4.8424,-14.594 4.4338,-3.0736 9.4544,-1.5231 11.214,3.4632 1.7594,4.9862 -0.40865,11.52 -4.8424,14.594 -4.4338,3.0736 -9.4544,1.523 -11.214,-3.4632 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68809"
- style="color:#000000;fill:url(#radialGradient6872)"
- d="m 445.88,260.45 c -1.1174,-5.212 1.7601,-11.334 6.4269,-13.673 4.6669,-2.3395 9.3559,-0.011 10.473,5.201 1.1174,5.212 -1.7601,11.334 -6.427,13.673 -4.6669,2.3396 -9.3559,0.011 -10.473,-5.201 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68811"
- style="color:#000000;fill:url(#radialGradient6869)"
- d="m 451.49,268.96 c -1.0089,-5.2916 2.0189,-11.384 6.7627,-13.607 4.7438,-2.2234 9.4074,0.26391 10.416,5.5556 1.0089,5.2916 -2.0189,11.384 -6.7628,13.607 -4.7438,2.2234 -9.4073,-0.26392 -10.416,-5.5556 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68813"
- style="color:#000000;fill:url(#radialGradient6866)"
- d="m 457.47,276.82 c -0.7207,-5.632 2.8008,-11.77 7.8656,-13.709 5.0648,-1.9392 9.7548,1.0543 10.476,6.6863 0.7207,5.632 -2.8009,11.77 -7.8657,13.709 -5.0648,1.9392 -9.7548,-1.0543 -10.476,-6.6863 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68815"
- style="color:#000000;fill:url(#radialGradient6863)"
- d="m 465.14,283.5 c -0.14533,-5.3819 3.6801,-10.714 8.5443,-11.91 4.8642,-1.1957 8.9252,2.1979 9.0706,7.5797 0.14533,5.3819 -3.6801,10.714 -8.5443,11.91 -4.8642,1.1957 -8.9252,-2.1979 -9.0705,-7.5797 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68817"
- style="color:#000000;fill:url(#radialGradient6860)"
- d="m 472.46,290.78 c 0.0995,-5.8788 4.4967,-11.45 9.8216,-12.444 5.3249,-0.99369 9.5609,2.9664 9.4615,8.8452 -0.0995,5.8788 -4.4968,11.45 -9.8216,12.444 -5.3249,0.99369 -9.5609,-2.9664 -9.4614,-8.8452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68819"
- style="color:#000000;fill:url(#radialGradient6857)"
- d="m 481.83,297.04 c 0.51884,-5.5645 5.0408,-10.421 10.1,-10.848 5.0593,-0.42673 8.74,3.7383 8.2212,9.3028 -0.51885,5.5645 -5.0408,10.421 -10.1,10.848 -5.0592,0.42673 -8.74,-3.7383 -8.2211,-9.3028 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68821"
- style="color:#000000;fill:url(#radialGradient6854)"
- d="m 490.67,303.16 c 0.97313,-6.0918 6.2667,-11.012 11.824,-10.989 5.5569,0.023 9.2728,4.98 8.2996,11.072 -0.97313,6.0918 -6.2668,11.012 -11.824,10.989 -5.5569,-0.023 -9.2727,-4.98 -8.2996,-11.072 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68823"
- style="color:#000000;fill:url(#radialGradient6851)"
- d="m 501.35,308.06 c 1.7194,-5.9338 7.5292,-9.9693 12.976,-9.0134 5.4473,0.95585 8.4694,6.541 6.7499,12.475 -1.7194,5.9338 -7.5292,9.9693 -12.977,9.0134 -5.4473,-0.95585 -8.4693,-6.541 -6.7499,-12.475 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68825"
- style="color:#000000;fill:url(#radialGradient6848)"
- d="m 513.04,313.58 c 1.9772,-5.6729 7.8138,-9.2039 13.036,-7.8868 5.2227,1.3172 7.8537,6.9837 5.8766,12.657 -1.9772,5.6729 -7.8138,9.2039 -13.037,7.8868 -5.2227,-1.3172 -7.8537,-6.9837 -5.8765,-12.657 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68827"
- style="color:#000000;fill:url(#radialGradient6845)"
- d="m 524.53,318.47 c 2.4714,-6.0306 8.989,-9.4218 14.558,-7.5746 5.5686,1.8473 8.0794,8.2336 5.608,14.264 -2.4714,6.0306 -8.989,9.4218 -14.558,7.5745 -5.5686,-1.8473 -8.0793,-8.2335 -5.608,-14.264 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68833"
- style="color:#000000;fill:url(#radialGradient6842)"
- d="m 443.96,183.75 c -3.4785,-2.7811 -4.3843,-8.8746 -2.0232,-13.61 2.3611,-4.7356 7.095,-6.3201 10.574,-3.5389 3.4785,2.7811 4.3843,8.8747 2.0232,13.61 -2.3611,4.7356 -7.095,6.32 -10.574,3.5389 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68835"
- style="color:#000000;fill:url(#radialGradient6839)"
- d="m 442.88,195.44 c -3.4568,-3.0846 -4.1216,-9.4495 -1.4848,-14.216 2.6368,-4.7669 7.5766,-6.1307 11.033,-3.046 3.4568,3.0846 4.1216,9.4496 1.4848,14.216 -2.6368,4.7669 -7.5766,6.1306 -11.033,3.046 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68837"
- style="color:#000000;fill:url(#radialGradient6836)"
- d="m 442.29,206.29 c -3.1785,-3.5654 -3.2548,-10.121 -0.17044,-14.642 3.0843,-4.5212 8.1613,-5.2961 11.34,-1.7307 3.1785,3.5654 3.2548,10.121 0.17042,14.642 -3.0843,4.5212 -8.1613,5.2961 -11.34,1.7307 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68839"
- style="color:#000000;fill:url(#radialGradient6833)"
- d="m 442.7,216.12 c -2.6174,-3.897 -1.9753,-10.222 1.4343,-14.127 3.4096,-3.9053 8.2954,-3.912 10.913,-0.015 2.6174,3.897 1.9752,10.222 -1.4343,14.127 -3.4096,3.9053 -8.2954,3.912 -10.913,0.015 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68841"
- style="color:#000000;fill:url(#radialGradient6830)"
- d="m 444.05,226.31 c -2.409,-4.1572 -1.3994,-10.529 2.255,-14.231 3.6544,-3.7024 8.5697,-3.3337 10.979,0.82345 2.409,4.1572 1.3994,10.529 -2.255,14.231 -3.6544,3.7024 -8.5697,3.3337 -10.979,-0.82348 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68843"
- style="color:#000000;fill:url(#radialGradient6827)"
- d="m 445.67,236.7 c -2.4088,-4.766 -0.95246,-11.724 3.2529,-15.542 4.2054,-3.8176 9.5673,-3.0488 11.976,1.7172 2.4088,4.766 0.95244,11.724 -3.253,15.542 -4.2054,3.8176 -9.5673,3.0488 -11.976,-1.7172 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68845"
- style="color:#000000;fill:url(#radialGradient6824)"
- d="m 449.11,245.17 c -1.7919,-4.6808 0.12455,-10.952 4.2805,-14.007 4.15595,-3.055 8.9777,-1.737 10.77,2.9438 1.7919,4.6808 -0.12458,10.952 -4.2806,14.007 -4.15602,3.055 -8.9777,1.737 -10.77,-2.9438 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68847"
- style="color:#000000;fill:url(#radialGradient6821)"
- d="m 452.86,253.93 c -1.4264,-4.9161 0.97232,-11.056 5.3576,-13.713 4.3853,-2.6574 9.0966,-0.82624 10.523,4.0899 1.4264,4.91614 -0.97235,11.056 -5.3576,13.713 -4.3853,2.6574 -9.0966,0.82623 -10.523,-4.0899 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68849"
- style="color:#000000;fill:url(#radialGradient6818)"
- d="m 457.34,261.52 c -0.68164,-5.1645 2.53,-10.813 7.1735,-12.617 4.6435,-1.8034 8.9604,0.92134 9.642,6.0859 0.68164,5.1645 -2.5301,10.813 -7.1736,12.617 -4.6435,1.8034 -8.9603,-0.92135 -9.642,-6.0859 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68851"
- style="color:#000000;fill:url(#radialGradient6815)"
- d="m 462.35,269.88 c -0.43458,-5.6186 3.3195,-11.463 8.385,-13.053 5.0655,-1.5905 9.5242,1.6749 9.9588,7.2935 0.43459,5.6186 -3.3195,11.463 -8.385,13.053 -5.0655,1.5905 -9.5242,-1.6749 -9.9588,-7.2935 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68853"
- style="color:#000000;fill:url(#radialGradient6812)"
- d="m 468.34,277.67 c -0.1115,-5.9548 4.1629,-11.806 9.5471,-13.07 5.3842,-1.2634 9.8395,2.5398 9.951,8.4946 0.11151,5.9548 -4.1629,11.806 -9.5472,13.07 -5.3842,1.2634 -9.8394,-2.5398 -9.9509,-8.4947 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68855"
- style="color:#000000;fill:url(#radialGradient6809)"
- d="m 476.08,284.74 c 0.273,-5.6666 4.6616,-10.863 9.8021,-11.606 5.1406,-0.74351 9.0866,3.2474 8.8136,8.9139 -0.273,5.6666 -4.6616,10.863 -9.8022,11.606 -5.1406,0.74351 -9.0865,-3.2474 -8.8135,-8.9139 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68857"
- style="color:#000000;fill:url(#radialGradient6806)"
- d="m 483.61,290.74 c 1.0952,-5.9964 6.4221,-10.704 11.898,-10.516 5.476,0.18869 9.0273,5.2027 7.9322,11.199 -1.0952,5.9964 -6.4221,10.704 -11.898,10.516 -5.476,-0.1887 -9.0273,-5.2027 -7.9321,-11.199 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68859"
- style="color:#000000;fill:url(#radialGradient6803)"
- d="m 492.84,297.42 c 1.3325,-5.787 6.7068,-10.06 12.004,-9.5447 5.2971,0.51557 8.511,5.6248 7.1784,11.412 -1.3325,5.787 -6.7068,10.06 -12.004,9.5447 -5.297,-0.51556 -8.5109,-5.6248 -7.1784,-11.412 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68861"
- style="color:#000000;fill:url(#radialGradient6800)"
- d="m 502.88,303.13 c 1.8486,-5.5418 7.4802,-9.0725 12.579,-7.886 5.0983,1.1865 7.7327,6.6408 5.884,12.183 -1.8486,5.5418 -7.4803,9.0725 -12.579,7.886 -5.0983,-1.1865 -7.7326,-6.6408 -5.884,-12.183 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68863"
- style="color:#000000;fill:url(#radialGradient6797)"
- d="m 513.22,309 c 2.1773,-5.6282 8.1506,-8.9198 13.342,-7.352 5.1912,1.5678 7.6344,7.4012 5.4571,13.029 -2.1773,5.6282 -8.1506,8.9198 -13.342,7.352 -5.1912,-1.5678 -7.6344,-7.4012 -5.4571,-13.029 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68865"
- style="color:#000000;fill:url(#radialGradient6794)"
- d="m 524.92,314.65 c 2.372,-5.3673 8.3189,-8.2163 13.283,-6.3635 4.9638,1.8528 7.0649,7.7058 4.6928,13.073 -2.372,5.3673 -8.3189,8.2163 -13.283,6.3635 -4.9638,-1.8528 -7.0648,-7.7058 -4.6928,-13.073 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68867"
- style="color:#000000;fill:url(#radialGradient6791)"
- d="m 536.54,319.13 c 3.0427,-5.6259 9.7473,-8.0666 14.975,-5.4513 5.2279,2.6152 6.9994,9.296 3.9567,14.922 -3.0427,5.6259 -9.7473,8.0665 -14.975,5.4513 -5.2279,-2.6152 -6.9994,-9.2959 -3.9567,-14.922 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68871"
- style="color:#000000;fill:url(#radialGradient6788)"
- d="m 456.4,173.09 c -3.1119,-3.0044 -3.5435,-8.9536 -0.96397,-13.288 2.5796,-4.3344 7.1934,-5.4127 10.305,-2.4083 3.1119,3.0044 3.5435,8.9536 0.96396,13.288 -2.5796,4.3344 -7.1934,5.4127 -10.305,2.4083 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68873"
- style="color:#000000;fill:url(#radialGradient6785)"
- d="m 454.35,185.31 c -3.1508,-3.4271 -3.3051,-9.8222 -0.34471,-14.284 2.9604,-4.4616 7.9146,-5.3002 11.065,-1.873 3.1508,3.4271 3.3051,9.8222 0.34469,14.284 -2.9604,4.4616 -7.9146,5.3002 -11.065,1.873 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68875"
- style="color:#000000;fill:url(#radialGradient6782)"
- d="m 453.2,197.3 c -3.2606,-3.7905 -3.2414,-10.644 0.043,-15.307 3.2844,-4.6633 8.5902,-5.3709 11.851,-1.5804 3.2607,3.7905 3.2414,10.644 -0.043,15.307 -3.2844,4.6633 -8.5902,5.3709 -11.851,1.5804 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68877"
- style="color:#000000;fill:url(#radialGradient6779)"
- d="m 453.03,208.14 c -3.0233,-4.0074 -2.6438,-10.837 0.84754,-15.254 3.4914,-4.4172 8.7725,-4.7494 11.796,-0.74199 3.0233,4.0074 2.6438,10.837 -0.84756,15.254 -3.4914,4.4172 -8.7725,4.7494 -11.796,0.74196 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68879"
- style="color:#000000;fill:url(#radialGradient6776)"
- d="m 453.1,217.75 c -2.3226,-4.5389 -0.95984,-11.194 3.0439,-14.864 4.0037,-3.6702 9.1322,-2.9661 11.455,1.5728 2.3226,4.5389 0.95981,11.194 -3.0439,14.864 -4.0037,3.6702 -9.1322,2.966 -11.455,-1.5729 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68881"
- style="color:#000000;fill:url(#radialGradient6773)"
- d="m 454.52,227.47 c -1.9026,-4.7399 -0.0367,-11.177 4.1678,-14.377 4.2045,-3.2002 9.1553,-1.952 11.058,2.7879 1.9026,4.7399 0.0366,11.177 -4.1678,14.377 -4.2045,3.2002 -9.1553,1.952 -11.058,-2.7879 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68883"
- style="color:#000000;fill:url(#radialGradient6770)"
- d="m 457.05,237.74 c -1.9439,-4.7762 -0.0863,-11.288 4.1491,-14.545 4.2354,-3.257 9.2448,-2.0255 11.189,2.7506 1.9439,4.7762 0.0863,11.288 -4.1492,14.545 -4.2354,3.257 -9.2448,2.0255 -11.189,-2.7507 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68885"
- style="color:#000000;fill:url(#radialGradient6767)"
- d="m 459.4,246.17 c -1.189,-5.369 1.7429,-11.712 6.5487,-14.168 4.8057,-2.456 9.6654,-0.0945 10.854,5.2744 1.189,5.369 -1.743,11.712 -6.5487,14.168 -4.8057,2.456 -9.6654,0.0945 -10.854,-5.2744 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68887"
- style="color:#000000;fill:url(#radialGradient6764)"
- d="m 463.27,255.9 c -1.2973,-5.5621 1.6846,-12.198 6.6603,-14.821 4.9757,-2.6236 10.061,-0.24145 11.358,5.3206 1.2973,5.5621 -1.6847,12.198 -6.6603,14.821 -4.9757,2.6236 -10.061,0.24143 -11.358,-5.3206 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68889"
- style="color:#000000;fill:url(#radialGradient6761)"
- d="m 468.09,263.25 c -0.46901,-5.5917 3.2362,-11.444 8.2758,-13.071 5.0396,-1.6271 9.5052,1.5869 9.9742,7.1786 0.46901,5.5917 -3.2362,11.444 -8.2758,13.071 -5.0396,1.6271 -9.5052,-1.5869 -9.9742,-7.1786 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68891"
- style="color:#000000;fill:url(#radialGradient6758)"
- d="m 473.94,271.07 c -0.0633,-5.4987 3.9172,-10.863 8.8908,-11.982 4.9736,-1.1186 9.0568,2.4322 9.1201,7.9308 0.0633,5.4987 -3.9173,10.863 -8.8908,11.982 -4.9736,1.1186 -9.0568,-2.4322 -9.1201,-7.9308 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68893"
- style="color:#000000;fill:url(#radialGradient6755)"
- d="m 480.16,278.35 c 0.47303,-5.6674 5.0316,-10.668 10.182,-11.17 5.1503,-0.50165 8.942,3.686 8.469,9.3534 -0.47303,5.6674 -5.0317,10.668 -10.182,11.17 -5.1503,0.50165 -8.942,-3.686 -8.4689,-9.3534 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68895"
- style="color:#000000;fill:url(#radialGradient6752)"
- d="m 487.32,286.32 c 0.49384,-5.7803 5.1529,-10.87 10.406,-11.368 5.2534,-0.49788 9.1119,3.7844 8.618,9.5647 -0.49384,5.7803 -5.1529,10.87 -10.406,11.368 -5.2534,0.49788 -9.1118,-3.7844 -8.618,-9.5647 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68897"
- style="color:#000000;fill:url(#radialGradient6749)"
- d="m 494.78,292.73 c 1.1368,-6.1655 6.6231,-10.996 12.254,-10.789 5.6308,0.2071 9.274,5.3731 8.1371,11.539 -1.1368,6.1655 -6.6232,10.996 -12.254,10.789 -5.6308,-0.2071 -9.2739,-5.3731 -8.1371,-11.539 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68899"
- style="color:#000000;fill:url(#radialGradient6746)"
- d="m 504.37,298.19 c 1.905,-5.6889 7.6922,-9.3062 12.926,-8.0795 5.234,1.2268 7.9327,6.833 6.0277,12.522 -1.905,5.6889 -7.6922,9.3062 -12.926,8.0795 -5.234,-1.2268 -7.9327,-6.833 -6.0277,-12.522 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68901"
- style="color:#000000;fill:url(#radialGradient6743)"
- d="m 514.1,304.81 c 2.03,-5.671 7.91,-9.1484 13.133,-7.767 5.2234,1.3814 7.8121,7.0985 5.7821,12.77 -2.03,5.671 -7.91,9.1484 -13.133,7.767 -5.2234,-1.3814 -7.8121,-7.0985 -5.7821,-12.77 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68903"
- style="color:#000000;fill:url(#radialGradient6740)"
- d="m 524.62,310.63 c 2.3594,-5.6446 8.499,-8.7735 13.713,-6.9885 5.2142,1.785 7.5286,7.8078 5.1692,13.452 -2.3594,5.6446 -8.499,8.7735 -13.713,6.9885 -5.2142,-1.785 -7.5285,-7.8078 -5.1691,-13.452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68905"
- style="color:#000000;fill:url(#radialGradient6737)"
- d="m 536.08,315.86 c 2.7803,-5.5206 9.1855,-8.117 14.306,-5.7993 5.1209,2.3177 7.0183,8.672 4.2379,14.193 -2.7803,5.5206 -9.1855,8.117 -14.306,5.7993 -5.1209,-2.3177 -7.0182,-8.672 -4.2379,-14.193 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68911"
- style="color:#000000;fill:url(#radialGradient6734)"
- d="m 467.11,175.59 c -3.2635,-3.4807 -3.474,-10.038 -0.47019,-14.646 3.0038,-4.6081 8.0845,-5.522 11.348,-2.0414 3.2635,3.4807 3.474,10.038 0.47017,14.646 -3.0038,4.6081 -8.0845,5.522 -11.348,2.0413 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68913"
- style="color:#000000;fill:url(#radialGradient6731)"
- d="m 465.1,186.99 c -2.9187,-3.8531 -2.5639,-10.431 0.79245,-14.693 3.3564,-4.2615 8.4434,-4.5926 11.362,-0.73942 2.9187,3.8531 2.5639,10.431 -0.79247,14.693 -3.3564,4.2615 -8.4434,4.5925 -11.362,0.73939 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68915"
- style="color:#000000;fill:url(#radialGradient6728)"
- d="m 464.58,197.98 c -2.6289,-3.7839 -2.0794,-10.011 1.2273,-13.909 3.3067,-3.8978 8.1185,-3.99 10.747,-0.20611 2.6289,3.7839 2.0794,10.011 -1.2273,13.909 -3.3067,3.8978 -8.1185,3.99 -10.747,0.20609 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68917"
- style="color:#000000;fill:url(#radialGradient6725)"
- d="m 463.75,208.5 c -2.1682,-4.4053 -0.77259,-10.78 3.1172,-14.238 3.8898,-3.4581 8.8007,-2.6902 10.969,1.7151 2.1682,4.4053 0.77257,10.78 -3.1172,14.238 -3.8898,3.4581 -8.8007,2.6902 -10.969,-1.7152 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68919"
- style="color:#000000;fill:url(#radialGradient6722)"
- d="m 464.9,219.42 c -2.1981,-4.3025 -0.90338,-10.607 2.8919,-14.082 3.7953,-3.4748 8.654,-2.8039 10.852,1.4986 2.1981,4.3025 0.90335,10.607 -2.892,14.082 -3.7953,3.4748 -8.654,2.8039 -10.852,-1.4986 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68921"
- style="color:#000000;fill:url(#radialGradient6719)"
- d="m 465.72,229.56 c -1.912,-4.8964 0.0609,-11.493 4.4065,-14.734 4.3456,-3.2411 9.4184,-1.8993 11.33,2.997 1.912,4.8963 -0.0609,11.493 -4.4066,14.734 -4.3456,3.2411 -9.4184,1.8993 -11.33,-2.997 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68923"
- style="color:#000000;fill:url(#radialGradient6716)"
- d="m 467.24,238.86 c -1.3911,-5.5296 1.4875,-12.226 6.4295,-14.957 4.942,-2.7309 10.076,-0.46223 11.467,5.0673 1.3911,5.5296 -1.4875,12.226 -6.4295,14.957 -4.942,2.7309 -10.076,0.46221 -11.467,-5.0673 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68925"
- style="color:#000000;fill:url(#radialGradient6713)"
- d="m 470.75,247.06 c -0.6549,-5.3889 2.744,-11.228 7.5917,-13.041 4.8477,-1.8136 9.3085,1.0848 9.9634,6.4737 0.65491,5.3889 -2.744,11.228 -7.5917,13.041 -4.8477,1.8136 -9.3084,-1.0848 -9.9633,-6.4737 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68927"
- style="color:#000000;fill:url(#radialGradient6710)"
- d="m 474.94,256.63 c -0.71807,-5.3778 2.6192,-11.268 7.4541,-13.156 4.8349,-1.8879 9.3364,0.94127 10.054,6.3191 0.71807,5.3778 -2.6193,11.268 -7.4541,13.156 -4.8349,1.8879 -9.3364,-0.94128 -10.054,-6.3191 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68929"
- style="color:#000000;fill:url(#radialGradient6707)"
- d="m 479.32,264 c 0.1476,-5.6841 4.4428,-11.02 9.5937,-11.919 5.1509,-0.89856 9.2069,2.9809 9.0593,8.665 -0.1476,5.6841 -4.4429,11.02 -9.5938,11.919 -5.1509,0.89857 -9.2068,-2.9809 -9.0592,-8.665 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68931"
- style="color:#000000;fill:url(#radialGradient6704)"
- d="m 484.3,272.63 c 0.26586,-6.1674 5.0158,-11.854 10.609,-12.701 5.5935,-0.84706 9.9125,3.4659 9.6466,9.6333 -0.26585,6.1674 -5.0158,11.854 -10.609,12.701 -5.5935,0.84706 -9.9124,-3.4659 -9.6466,-9.6333 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68933"
- style="color:#000000;fill:url(#radialGradient6701)"
- d="m 491.53,279.2 c 1.0261,-5.6766 6.0598,-10.144 11.243,-9.9783 5.1834,0.1657 8.5536,4.9018 7.5276,10.578 -1.0261,5.6766 -6.0599,10.144 -11.243,9.9783 -5.1834,-0.16571 -8.5536,-4.9018 -7.5276,-10.578 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68935"
- style="color:#000000;fill:url(#radialGradient6698)"
- d="m 497.96,287.44 c 1.0025,-6.2586 6.4433,-11.31 12.152,-11.284 5.7091,0.0269 9.5246,5.1223 8.5221,11.381 -1.0025,6.2586 -6.4433,11.31 -12.152,11.284 -5.7091,-0.0269 -9.5246,-5.1223 -8.5221,-11.381 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68937"
- style="color:#000000;fill:url(#radialGradient6695)"
- d="m 506.71,293.76 c 1.5462,-5.8289 7.1324,-9.9331 12.477,-9.1668 5.3446,0.76621 8.4238,6.1126 6.8775,11.942 -1.5462,5.8289 -7.1324,9.933 -12.477,9.1668 -5.3446,-0.76621 -8.4238,-6.1126 -6.8775,-11.942 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68939"
- style="color:#000000;fill:url(#radialGradient6692)"
- d="m 515.29,300.33 c 1.9054,-6.0195 7.9354,-9.9552 13.469,-8.7906 5.5332,1.1646 8.4741,6.9884 6.5688,13.008 -1.9054,6.0195 -7.9355,9.9552 -13.469,8.7906 -5.5332,-1.1646 -8.4741,-6.9884 -6.5687,-13.008 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68941"
- style="color:#000000;fill:url(#radialGradient6689)"
- d="m 525.1,305.96 c 2.4858,-5.9202 8.9347,-9.1907 14.404,-7.3049 5.4693,1.8858 7.8878,8.2137 5.402,14.134 -2.4858,5.9202 -8.9348,9.1907 -14.404,7.3049 -5.4693,-1.8858 -7.8878,-8.2137 -5.4019,-14.134 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68943"
- style="color:#000000;fill:url(#radialGradient6686)"
- d="m 536.16,310.36 c 3.421,-5.507 10.359,-7.462 15.496,-4.3666 5.1373,3.0954 6.5286,10.069 3.1077,15.576 -3.421,5.507 -10.359,7.462 -15.496,4.3666 -5.1373,-3.0954 -6.5286,-10.069 -3.1076,-15.576 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68945"
- style="color:#000000;fill:url(#radialGradient6683)"
- d="m 548.04,315.97 c 3.6199,-5.1263 10.447,-6.5191 15.248,-3.1109 4.8016,3.4082 5.7597,10.327 2.1398,15.453 -3.6199,5.1263 -10.447,6.5191 -15.249,3.1109 -4.8016,-3.4082 -5.7597,-10.327 -2.1398,-15.453 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68951"
- style="color:#000000;fill:url(#radialGradient6680)"
- d="m 478.24,177.34 c -3.1025,-3.6702 -3.0376,-10.252 0.14492,-14.701 3.1826,-4.4492 8.2776,-5.0808 11.38,-1.4106 3.1025,3.6702 3.0376,10.252 -0.14494,14.701 -3.1826,4.4492 -8.2776,5.0807 -11.38,1.4106 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68953"
- style="color:#000000;fill:url(#radialGradient6677)"
- d="m 475.75,188.38 c -2.5407,-4.329 -1.5166,-10.995 2.2874,-14.89 3.804,-3.8943 8.9474,-3.5419 11.488,0.78713 2.5407,4.329 1.5165,10.995 -2.2875,14.89 -3.804,3.8943 -8.9474,3.5419 -11.488,-0.78715 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68955"
- style="color:#000000;fill:url(#radialGradient6674)"
- d="m 475.05,199.56 c -2.3185,-4.3807 -1.0683,-10.879 2.7925,-14.514 3.8608,-3.6353 8.8701,-3.031 11.189,1.3497 2.3185,4.3807 1.0683,10.879 -2.7925,14.514 -3.8608,3.6353 -8.8701,3.031 -11.189,-1.3497 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68957"
- style="color:#000000;fill:url(#radialGradient6671)"
- d="m 475.17,210.52 c -2.17,-4.4148 -0.76892,-10.8 3.1293,-14.262 3.8983,-3.462 8.8175,-2.6896 10.988,1.7252 2.17,4.4148 0.76889,10.8 -3.1294,14.262 -3.89829,3.462 -8.8175,2.6896 -10.987,-1.7252 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68959"
- style="color:#000000;fill:url(#radialGradient6668)"
- d="m 475.41,220.52 c -1.6714,-4.8607 0.4791,-11.187 4.8032,-14.13 4.3241,-2.9433 9.1844,-1.3889 10.856,3.4718 1.6714,4.8607 -0.47913,11.187 -4.8032,14.13 -4.3241,2.9433 -9.1844,1.3889 -10.856,-3.4718 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68961"
- style="color:#000000;fill:url(#radialGradient6665)"
- d="m 476.25,230.98 c -1.5336,-5.4485 1.1648,-12.207 6.0271,-15.095 4.8623,-2.888 10.047,-0.81234 11.581,4.6362 1.5336,5.4485 -1.1648,12.207 -6.0271,15.095 -4.8623,2.888 -10.047,0.81233 -11.581,-4.6362 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68963"
- style="color:#000000;fill:url(#radialGradient6662)"
- d="m 478.43,240.42 c -1.1512,-5.6776 2.0391,-12.281 7.1259,-14.75 5.0868,-2.4688 10.144,0.13249 11.295,5.8101 1.1512,5.6776 -2.0392,12.281 -7.1259,14.75 -5.0868,2.4688 -10.144,-0.13252 -11.295,-5.8101 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68965"
- style="color:#000000;fill:url(#radialGradient6659)"
- d="m 481.81,249.07 c -0.61005,-5.6304 3.0041,-11.658 8.0724,-13.463 5.0683,-1.805 9.6716,1.296 10.282,6.9264 0.61005,5.6304 -3.0041,11.658 -8.0724,13.463 -5.0683,1.8051 -9.6715,-1.296 -10.282,-6.9264 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68967"
- style="color:#000000;fill:url(#radialGradient6656)"
- d="m 485.42,258.22 c -0.41433,-5.9694 3.6143,-12.132 8.9981,-13.764 5.3839,-1.6325 10.084,1.8832 10.499,7.8526 0.41433,5.9694 -3.6143,12.132 -8.9982,13.764 -5.3839,1.6325 -10.084,-1.8833 -10.499,-7.8526 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68969"
- style="color:#000000;fill:url(#radialGradient6653)"
- d="m 490.3,265.29 c 0.53453,-5.954 5.3555,-11.171 10.768,-11.653 5.4125,-0.48157 9.3668,3.9547 8.8323,9.9088 -0.53453,5.954 -5.3556,11.171 -10.768,11.653 -5.4125,0.48156 -9.3668,-3.9547 -8.8323,-9.9088 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68971"
- style="color:#000000;fill:url(#radialGradient6650)"
- d="m 496.69,273.46 c 0.71877,-5.5301 5.3848,-10.158 10.422,-10.336 5.0371,-0.17832 8.5378,4.1602 7.819,9.6902 -0.71877,5.5301 -5.3848,10.158 -10.422,10.336 -5.0371,0.17832 -8.5377,-4.1602 -7.819,-9.6902 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68973"
- style="color:#000000;fill:url(#radialGradient6647)"
- d="m 502.29,280.85 c 1.271,-6.0937 6.8183,-10.723 12.39,-10.34 5.5719,0.38304 9.0585,5.6335 7.7874,11.727 -1.271,6.0937 -6.8183,10.723 -12.39,10.34 -5.5719,-0.38304 -9.0584,-5.6335 -7.7874,-11.727 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68975"
- style="color:#000000;fill:url(#radialGradient6644)"
- d="m 509.78,287.76 c 1.7581,-5.9653 7.6236,-9.9931 13.101,-8.9965 5.4775,0.99665 8.4927,6.6404 6.7346,12.606 -1.7581,5.9653 -7.6236,9.9931 -13.101,8.9965 -5.4775,-0.99665 -8.4926,-6.6404 -6.7346,-12.606 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68977"
- style="color:#000000;fill:url(#radialGradient6641)"
- d="m 517.93,294.64 c 2.1032,-5.9302 8.2353,-9.5857 13.696,-8.1648 5.4612,1.4209 8.1834,7.38 6.0802,13.31 -2.1032,5.9302 -8.2353,9.5857 -13.697,8.1648 -5.4612,-1.4209 -8.1834,-7.38 -6.0802,-13.31 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68979"
- style="color:#000000;fill:url(#radialGradient6638)"
- d="m 527.63,300.85 c 2.5068,-5.406 8.5961,-8.1602 13.601,-6.1517 5.0048,2.0085 7.03,8.019 4.5232,13.425 -2.5068,5.406 -8.5961,8.1602 -13.601,6.1517 -5.0048,-2.0085 -7.0299,-8.019 -4.5232,-13.425 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68981"
- style="color:#000000;fill:url(#radialGradient6635)"
- d="m 536.95,306.13 c 3.3035,-5.6031 10.212,-7.7658 15.431,-4.8307 5.219,2.9351 6.7717,9.8567 3.4682,15.46 -3.3035,5.6031 -10.212,7.7658 -15.431,4.8307 -5.219,-2.9351 -6.7717,-9.8567 -3.4681,-15.46 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68983"
- style="color:#000000;fill:url(#radialGradient6632)"
- d="m 548.75,312.19 c 3.3827,-4.783 9.757,-6.0774 14.237,-2.8911 4.4803,3.1863 5.3702,9.6468 1.9874,14.43 -3.3827,4.783 -9.757,6.0774 -14.237,2.891 -4.4804,-3.1863 -5.3701,-9.6468 -1.9874,-14.43 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68985"
- style="color:#000000;fill:url(#radialGradient6629)"
- d="m 560.01,316.95 c 4.0469,-4.7622 10.968,-5.3851 15.46,-1.3912 4.4913,3.9939 4.8515,11.092 0.80457,15.854 -4.0469,4.7622 -10.969,5.385 -15.46,1.3912 -4.4913,-3.9939 -4.8515,-11.092 -0.80454,-15.854 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68991"
- style="color:#000000;fill:url(#radialGradient6626)"
- d="m 489.24,178.39 c -2.6047,-3.9189 -1.9356,-10.253 1.4944,-14.147 3.43,-3.894 8.3221,-3.8738 10.927,0.0451 2.6047,3.9189 1.9356,10.253 -1.4944,14.147 -3.43,3.894 -8.3221,3.8738 -10.927,-0.0452 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68993"
- style="color:#000000;fill:url(#radialGradient6623)"
- d="m 487.51,190.31 c -2.5338,-4.1268 -1.6523,-10.591 1.969,-14.439 3.6213,-3.8477 8.611,-3.6215 11.145,0.50529 2.5338,4.1268 1.6523,10.591 -1.969,14.439 -3.6213,3.8477 -8.6109,3.6214 -11.145,-0.50532 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68995"
- style="color:#000000;fill:url(#radialGradient6620)"
- d="m 485.39,201.2 c -2.0221,-5.0597 -0.0227,-11.922 4.4659,-15.327 4.4885,-3.4053 9.7665,-2.0642 11.789,2.9955 2.0221,5.0597 0.0226,11.922 -4.4659,15.327 -4.4885,3.4054 -9.7664,2.0642 -11.789,-2.9955 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68997"
- style="color:#000000;fill:url(#radialGradient6617)"
- d="m 485.98,212.33 c -2.0082,-4.8101 -0.18017,-11.418 4.0831,-14.759 4.2633,-3.3413 9.3474,-2.1505 11.356,2.6596 2.0082,4.8101 0.18014,11.418 -4.0831,14.759 -4.2633,3.3413 -9.3473,2.1505 -11.356,-2.6596 z"
- inkscape:connector-curvature="0" />
- <path
- id="use68999"
- style="color:#000000;fill:url(#radialGradient6614)"
- d="m 486.42,221.94 c -1.3431,-5.1142 1.2713,-11.363 5.8396,-13.957 4.5683,-2.5942 9.3604,-0.55134 10.704,4.5629 1.3431,5.1142 -1.2714,11.363 -5.8396,13.957 -4.5683,2.5942 -9.3604,0.55133 -10.704,-4.5629 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69001"
- style="color:#000000;fill:url(#radialGradient6611)"
- d="m 488.02,231.61 c -0.91949,-5.2005 2.1171,-11.117 6.7825,-13.215 4.6654,-2.098 9.1928,0.41711 10.112,5.6176 0.91949,5.2005 -2.1172,11.117 -6.7826,13.215 -4.6654,2.098 -9.1928,-0.41713 -10.112,-5.6176 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69003"
- style="color:#000000;fill:url(#radialGradient6608)"
- d="m 489.93,241.01 c -0.48875,-5.5909 3.1991,-11.461 8.2371,-13.112 5.038,-1.6508 9.5183,1.5433 10.007,7.1342 0.48875,5.5909 -3.1992,11.461 -8.2371,13.112 -5.038,1.6508 -9.5183,-1.5433 -10.007,-7.1342 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69005"
- style="color:#000000;fill:url(#radialGradient6605)"
- d="m 493.52,249.7 c 0.0102,-5.4134 3.9905,-10.623 8.8902,-11.637 4.8997,-1.0135 8.8635,2.5533 8.8533,7.9668 -0.0102,5.4134 -3.9905,10.623 -8.8902,11.637 -4.8997,1.0135 -8.8635,-2.5533 -8.8533,-7.9668 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69007"
- style="color:#000000;fill:url(#radialGradient6602)"
- d="m 497.33,258.82 c 0.19579,-5.6264 4.4895,-10.86 9.5902,-11.689 5.1008,-0.82931 9.077,3.0595 8.8812,8.6858 -0.1958,5.6264 -4.4895,10.86 -9.5903,11.689 -5.1008,0.8293 -9.077,-3.0595 -8.8812,-8.6859 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69009"
- style="color:#000000;fill:url(#radialGradient6599)"
- d="m 502.08,267.35 c 0.47864,-5.7406 5.0957,-10.807 10.313,-11.315 5.2168,-0.50874 9.0579,3.7325 8.5792,9.4731 -0.47865,5.7406 -5.0957,10.807 -10.313,11.315 -5.2168,0.50874 -9.0578,-3.7325 -8.5792,-9.4731 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69011"
- style="color:#000000;fill:url(#radialGradient6596)"
- d="m 507.3,274.14 c 1.4348,-6.0086 7.0583,-10.395 12.561,-9.798 5.5022,0.5973 8.7996,5.9524 7.3648,11.961 -1.4348,6.0086 -7.0584,10.395 -12.561,9.798 -5.5022,-0.5973 -8.7995,-5.9524 -7.3647,-11.961 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69013"
- style="color:#000000;fill:url(#radialGradient6593)"
- d="m 514.21,281.9 c 1.6708,-5.7614 7.3129,-9.6783 12.602,-8.7486 5.2891,0.92968 8.2223,6.3539 6.5515,12.115 -1.6708,5.7614 -7.3129,9.6783 -12.602,8.7486 -5.2891,-0.92968 -8.2223,-6.3539 -6.5515,-12.115 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69015"
- style="color:#000000;fill:url(#radialGradient6590)"
- d="m 521.69,288.41 c 2.3482,-5.6251 8.464,-8.746 13.66,-6.9709 5.196,1.7751 7.5047,7.7742 5.1565,13.399 -2.3482,5.6251 -8.4641,8.746 -13.66,6.9709 -5.196,-1.7751 -7.5046,-7.7742 -5.1564,-13.399 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69017"
- style="color:#000000;fill:url(#radialGradient6587)"
- d="m 530.1,295.25 c 2.6809,-5.4225 8.9299,-8.0219 13.958,-5.8058 5.0276,2.216 6.93,8.4083 4.2492,13.831 -2.6809,5.4225 -8.9299,8.0219 -13.958,5.8058 -5.0276,-2.216 -6.93,-8.4083 -4.2491,-13.831 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69019"
- style="color:#000000;fill:url(#radialGradient6584)"
- d="m 538.6,302.24 c 2.8521,-5.686 9.4394,-8.3715 14.713,-5.9983 5.2738,2.3732 7.2369,8.9065 4.3848,14.592 -2.8521,5.686 -9.4394,8.3715 -14.713,5.9983 -5.2738,-2.3732 -7.2369,-8.9065 -4.3848,-14.592 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69021"
- style="color:#000000;fill:url(#radialGradient6581)"
- d="m 548.8,307.12 c 3.7429,-5.3139 10.812,-6.7669 15.789,-3.2454 4.977,3.5216 5.9773,10.684 2.2344,15.998 -3.7429,5.3139 -10.812,6.7669 -15.789,3.2453 -4.9769,-3.5216 -5.9773,-10.684 -2.2344,-15.998 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69023"
- style="color:#000000;fill:url(#radialGradient6578)"
- d="m 560.15,314.02 c 3.4736,-4.8028 9.9393,-6.0272 14.442,-2.7347 4.5023,3.2925 5.3363,9.855 1.8628,14.658 -3.4736,4.8028 -9.9393,6.0272 -14.442,2.7347 -4.5023,-3.2925 -5.3363,-9.855 -1.8627,-14.658 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69029"
- style="color:#000000;fill:url(#radialGradient6575)"
- d="m 502.7,169.58 c -3.03,-3.2124 -2.6409,-8.6297 0.86893,-12.1 3.5099,-3.4702 8.8114,-3.6793 11.841,-0.46688 3.03,3.2124 2.6409,8.6297 -0.86895,12.1 -3.5099,3.4702 -8.8114,3.6792 -11.841,0.46685 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69031"
- style="color:#000000;fill:url(#radialGradient6572)"
- d="m 499.9,179.57 c -2.1258,-4.3818 -0.71154,-10.692 3.1589,-14.095 3.8704,-3.4024 8.7313,-2.6083 10.857,1.7735 2.1258,4.3819 0.71151,10.692 -3.1589,14.095 -3.8704,3.4024 -8.7313,2.6083 -10.857,-1.7736 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69033"
- style="color:#000000;fill:url(#radialGradient6569)"
- d="m 497.93,192.11 c -2.3223,-4.7652 -0.79317,-11.638 3.4154,-15.351 4.2086,-3.7127 9.5029,-2.8595 11.825,1.9057 2.3223,4.7652 0.79314,11.638 -3.4154,15.351 -4.2086,3.7127 -9.5029,2.8595 -11.825,-1.9057 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69035"
- style="color:#000000;fill:url(#radialGradient6566)"
- d="m 496.93,203 c -1.937,-4.9911 0.084,-11.704 4.5143,-14.993 4.4302,-3.2894 9.5919,-1.91 11.529,3.0811 1.937,4.9911 -0.0841,11.704 -4.5143,14.993 -4.4302,3.2894 -9.5919,1.91 -11.529,-3.0811 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69037"
- style="color:#000000;fill:url(#radialGradient6563)"
- d="m 496.83,213.34 c -1.4698,-5.1451 1.0601,-11.548 5.6507,-14.301 4.5906,-2.7533 9.5035,-0.81436 10.973,4.3308 1.4698,5.1451 -1.0601,11.548 -5.6507,14.301 -4.5906,2.7533 -9.5035,0.81435 -10.973,-4.3308 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69039"
- style="color:#000000;fill:url(#radialGradient6560)"
- d="m 497.71,222.98 c -0.87146,-5.1779 2.1893,-11.026 6.8363,-13.061 4.6471,-2.0356 9.1207,0.51177 9.9922,5.6897 0.87146,5.1779 -2.1893,11.026 -6.8364,13.061 -4.6471,2.0356 -9.1207,-0.51178 -9.9921,-5.6897 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69041"
- style="color:#000000;fill:url(#radialGradient6557)"
- d="m 498.5,233.18 c -0.60744,-5.791 3.1267,-11.971 8.3405,-13.803 5.2138,-1.8323 9.9329,1.3768 10.54,7.1678 0.60744,5.791 -3.1268,11.971 -8.3406,13.803 -5.2138,1.8323 -9.9328,-1.3768 -10.54,-7.1679 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69043"
- style="color:#000000;fill:url(#radialGradient6554)"
- d="m 500.53,242.21 c -0.015,-6.0916 4.4414,-11.98 9.9538,-13.153 5.5124,-1.1726 9.9932,2.8151 10.008,8.9067 0.015,6.0916 -4.4415,11.98 -9.9538,13.153 -5.5124,1.1726 -9.9932,-2.8151 -10.008,-8.9068 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69045"
- style="color:#000000;fill:url(#radialGradient6551)"
- d="m 504.44,250.85 c 0.47442,-5.7178 5.0712,-10.766 10.267,-11.276 5.196,-0.50952 9.0236,3.7126 8.5492,9.4304 -0.47442,5.7178 -5.0712,10.766 -10.267,11.276 -5.196,0.50952 -9.0236,-3.7126 -8.5492,-9.4304 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69047"
- style="color:#000000;fill:url(#radialGradient6548)"
- d="m 508.61,260.14 c 0.54103,-5.7072 5.1865,-10.68 10.376,-11.107 5.1894,-0.42694 8.9577,3.8536 8.4167,9.5608 -0.54102,5.7072 -5.1865,10.68 -10.376,11.107 -5.1894,0.42695 -8.9577,-3.8536 -8.4167,-9.5608 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69049"
- style="color:#000000;fill:url(#radialGradient6545)"
- d="m 513.72,268.35 c 0.92954,-5.5863 5.8154,-10.061 10.913,-9.9954 5.0974,0.066 8.4762,4.6482 7.5466,10.235 -0.92955,5.5863 -5.8154,10.061 -10.913,9.9954 -5.0974,-0.066 -8.4761,-4.6482 -7.5466,-10.235 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69051"
- style="color:#000000;fill:url(#radialGradient6542)"
- d="m 519.14,275.63 c 1.64,-5.7434 7.2427,-9.6732 12.514,-8.7774 5.2714,0.8958 8.2153,6.278 6.5753,12.021 -1.64,5.7434 -7.2428,9.6732 -12.514,8.7774 -5.2714,-0.89581 -8.2153,-6.278 -6.5753,-12.021 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69053"
- style="color:#000000;fill:url(#radialGradient6539)"
- d="m 525.26,283.63 c 1.848,-6.0008 7.8158,-9.9747 13.33,-8.8759 5.5137,1.0988 8.4853,6.8541 6.6372,12.855 -1.848,6.0008 -7.8159,9.9746 -13.33,8.8759 -5.5137,-1.0988 -8.4852,-6.8541 -6.6372,-12.855 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69055"
- style="color:#000000;fill:url(#radialGradient6536)"
- d="m 532.61,289.83 c 2.6824,-5.9299 9.305,-9.0171 14.792,-6.8954 5.4869,2.1217 7.7604,8.6489 5.078,14.579 -2.6824,5.9299 -9.305,9.0171 -14.792,6.8954 -5.4869,-2.1217 -7.7604,-8.6489 -5.078,-14.579 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69057"
- style="color:#000000;fill:url(#radialGradient6533)"
- d="m 541.19,297.05 c 2.8181,-5.6419 9.3442,-8.3183 14.577,-5.9779 5.2324,2.3404 7.1895,8.8114 4.3714,14.453 -2.8181,5.6419 -9.3443,8.3183 -14.577,5.9778 -5.2324,-2.3404 -7.1895,-8.8114 -4.3714,-14.453 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69059"
- style="color:#000000;fill:url(#radialGradient6530)"
- d="m 550.39,303.51 c 3.1603,-5.4418 9.8295,-7.5895 14.896,-4.7971 5.0666,2.7924 6.6119,9.4676 3.4516,14.909 -3.1603,5.4418 -9.8295,7.5895 -14.896,4.7971 -5.0666,-2.7924 -6.6118,-9.4676 -3.4515,-14.909 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69061"
- style="color:#000000;fill:url(#radialGradient6527)"
- d="m 561.1,308.29 c 4.0418,-4.7464 10.947,-5.3591 15.424,-1.3684 4.4768,3.9907 4.8294,11.074 0.78753,15.82 -4.0418,4.7464 -10.947,5.359 -15.424,1.3683 -4.4768,-3.9907 -4.8293,-11.074 -0.78751,-15.82 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69063"
- style="color:#000000;fill:url(#radialGradient6524)"
- d="m 571.33,314.89 c 4.0404,-4.9292 11.079,-5.7194 15.721,-1.765 4.6421,3.9544 5.1299,11.156 1.0894,16.085 -4.0404,4.9292 -11.079,5.7194 -15.721,1.765 -4.6421,-3.9544 -5.1298,-11.156 -1.0894,-16.085 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69069"
- style="color:#000000;fill:url(#radialGradient6521)"
- d="m 513.34,170.48 c -2.4638,-3.9166 -1.2427,-9.7625 2.7274,-13.057 3.9701,-3.2948 9.1857,-2.7908 11.649,1.1258 2.4638,3.9166 1.2427,9.7625 -2.7274,13.057 -3.9701,3.2948 -9.1857,2.7907 -11.649,-1.1258 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69071"
- style="color:#000000;fill:url(#radialGradient6518)"
- d="m 511.08,180.83 c -1.7427,-4.5235 0.0999,-10.595 4.1157,-13.56 4.0157,-2.9657 8.6839,-1.7028 10.427,2.8206 1.7427,4.5235 -0.1,10.595 -4.1157,13.56 -4.0157,2.9657 -8.6839,1.7028 -10.427,-2.8206 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69073"
- style="color:#000000;fill:url(#radialGradient6515)"
- d="m 509.22,193.38 c -1.9573,-4.8386 -0.0653,-11.424 4.226,-14.709 4.2913,-3.2851 9.3568,-2.0257 11.314,2.8128 1.9573,4.8385 0.0653,11.424 -4.226,14.709 -4.2913,3.2851 -9.3568,2.0257 -11.314,-2.8128 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69075"
- style="color:#000000;fill:url(#radialGradient6512)"
- d="m 508.23,203.61 c -1.2611,-5.0331 1.3633,-11.123 5.8618,-13.603 4.4985,-2.4796 9.1677,-0.40957 10.429,4.6235 1.2611,5.0331 -1.3633,11.123 -5.8619,13.603 -4.4985,2.4796 -9.1676,0.40956 -10.429,-4.6235 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69077"
- style="color:#000000;fill:url(#radialGradient6509)"
- d="m 507.77,214.64 c -1.0803,-5.44 1.9958,-11.745 6.8708,-14.083 4.8749,-2.3379 9.7026,0.1768 10.783,5.6168 1.0803,5.44 -1.9959,11.745 -6.8708,14.083 -4.8749,2.338 -9.7026,-0.17681 -10.783,-5.6168 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69079"
- style="color:#000000;fill:url(#radialGradient6506)"
- d="m 508.57,224.99 c -0.80614,-5.5391 2.5749,-11.671 7.5518,-13.696 4.9769,-2.025 9.665,0.82373 10.471,6.3628 0.80614,5.5391 -2.5749,11.671 -7.5518,13.696 -4.9769,2.025 -9.665,-0.82375 -10.471,-6.3629 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69081"
- style="color:#000000;fill:url(#radialGradient6503)"
- d="m 510.28,234.67 c -0.39725,-5.5621 3.347,-11.315 8.363,-12.85 5.016,-1.5346 9.4043,1.7302 9.8016,7.2923 0.39725,5.5621 -3.347,11.315 -8.363,12.85 -5.016,1.5346 -9.4043,-1.7302 -9.8015,-7.2923 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69083"
- style="color:#000000;fill:url(#radialGradient6500)"
- d="m 511.94,243.02 c 0.55542,-6.0727 5.4812,-11.384 11.002,-11.862 5.5208,-0.47877 9.5461,4.056 8.9906,10.129 -0.55543,6.0727 -5.4812,11.384 -11.002,11.862 -5.5208,0.47877 -9.546,-4.056 -8.9906,-10.129 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69085"
- style="color:#000000;fill:url(#radialGradient6497)"
- d="m 515.99,252.49 c 0.63852,-5.6393 5.3167,-10.451 10.449,-10.747 5.1323,-0.29613 8.7753,4.0354 8.1368,9.6747 -0.63851,5.6393 -5.3167,10.451 -10.449,10.747 -5.1323,0.29612 -8.7753,-4.0354 -8.1368,-9.6747 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69087"
- style="color:#000000;fill:url(#radialGradient6494)"
- d="m 519.25,261.1 c 1.1248,-6.18 6.6115,-11.036 12.255,-10.846 5.6434,0.18977 9.3066,5.3535 8.1818,11.534 -1.1248,6.18 -6.6116,11.036 -12.255,10.846 -5.6435,-0.18978 -9.3065,-5.3535 -8.1817,-11.534 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69089"
- style="color:#000000;fill:url(#radialGradient6491)"
- d="m 524.21,269.3 c 1.5328,-6.1464 7.3404,-10.57 12.972,-9.8801 5.6313,0.68977 8.9539,6.2316 7.4211,12.378 -1.5328,6.1464 -7.3405,10.57 -12.972,9.8801 -5.6313,-0.68977 -8.9538,-6.2316 -7.421,-12.378 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69091"
- style="color:#000000;fill:url(#radialGradient6488)"
- d="m 530.58,276.39 c 2.225,-5.7044 8.2946,-9.0228 13.557,-7.4118 5.2623,1.611 7.7246,7.5413 5.4996,13.246 -2.225,5.7044 -8.2946,9.0228 -13.557,7.4118 -5.2623,-1.611 -7.7246,-7.5413 -5.4996,-13.246 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69093"
- style="color:#000000;fill:url(#radialGradient6485)"
- d="m 537.25,283.47 c 2.8094,-5.5853 9.2866,-8.2156 14.467,-5.875 5.1807,2.3406 7.1031,8.7658 4.2937,14.351 -2.8094,5.5853 -9.2866,8.2156 -14.467,5.875 -5.1807,-2.3406 -7.103,-8.7658 -4.2937,-14.351 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69095"
- style="color:#000000;fill:url(#radialGradient6482)"
- d="m 544.82,291.45 c 2.7816,-5.4413 9.1297,-7.96 14.179,-5.6257 5.0492,2.3343 6.8874,8.6378 4.1058,14.079 -2.7816,5.4413 -9.1298,7.96 -14.179,5.6257 -5.0492,-2.3343 -6.8874,-8.6378 -4.1057,-14.079 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69097"
- style="color:#000000;fill:url(#radialGradient6479)"
- d="m 553.24,297.8 c 3.3458,-5.2158 10.006,-6.9638 14.877,-3.904 4.8704,3.0597 6.1063,9.7684 2.7605,14.984 -3.3458,5.2158 -10.006,6.9637 -14.877,3.904 -4.8704,-3.0597 -6.1063,-9.7684 -2.7604,-14.984 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69099"
- style="color:#000000;fill:url(#radialGradient6476)"
- d="m 562.49,303.98 c 3.8169,-4.9782 10.702,-6.0349 15.379,-2.3603 4.6764,3.6747 5.3732,10.689 1.5563,15.667 -3.8169,4.9782 -10.702,6.0349 -15.379,2.3602 -4.6764,-3.6747 -5.3732,-10.689 -1.5563,-15.667 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69101"
- style="color:#000000;fill:url(#radialGradient6473)"
- d="m 572.29,310.18 c 4.1273,-4.9053 11.222,-5.5873 15.846,-1.5232 4.6243,4.064 5.0273,11.335 0.90002,16.24 -4.1273,4.9053 -11.222,5.5872 -15.846,1.5232 -4.6243,-4.064 -5.0273,-11.335 -0.89999,-16.24 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69109"
- style="color:#000000;fill:url(#radialGradient6470)"
- d="m 524.6,171.26 c -2.0938,-4.6173 -0.47973,-11.123 3.6052,-14.532 4.0849,-3.4083 9.0938,-2.4282 11.188,2.1891 2.0938,4.6173 0.47971,11.123 -3.6052,14.532 -4.0849,3.4083 -9.0938,2.4282 -11.188,-2.1891 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69111"
- style="color:#000000;fill:url(#radialGradient6467)"
- d="m 522.17,183.02 c -1.79,-4.7468 0.1765,-11.08 4.3922,-14.145 4.2157,-3.0652 9.0843,-1.702 10.874,3.0448 1.79,4.7468 -0.17652,11.08 -4.3923,14.145 -4.2157,3.0652 -9.0843,1.702 -10.874,-3.0448 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69113"
- style="color:#000000;fill:url(#radialGradient6464)"
- d="m 519.74,194.07 c -1.234,-5.3733 1.663,-11.765 6.4707,-14.276 4.8077,-2.5112 9.7054,-0.19106 10.939,5.1822 1.234,5.3733 -1.6631,11.765 -6.4707,14.276 -4.8077,2.5112 -9.7054,0.19105 -10.939,-5.1823 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69115"
- style="color:#000000;fill:url(#radialGradient6461)"
- d="m 519.28,205.41 c -1.1199,-5.2744 1.8013,-11.459 6.5246,-13.813 4.7233,-2.3544 9.4602,0.0127 10.58,5.2872 1.1199,5.2744 -1.8013,11.459 -6.5246,13.813 -4.7233,2.3544 -9.4601,-0.0127 -10.58,-5.2872 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69117"
- style="color:#000000;fill:url(#radialGradient6458)"
- d="m 519.01,215.8 c -0.66034,-5.5419 2.8462,-11.533 7.8322,-13.383 4.9859,-1.8491 9.5632,1.1444 10.224,6.6863 0.66034,5.5419 -2.8463,11.534 -7.8322,13.383 -4.986,1.8491 -9.5631,-1.1444 -10.223,-6.6864 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69119"
- style="color:#000000;fill:url(#radialGradient6455)"
- d="m 519.86,225.93 c -0.2843,-5.6041 3.5864,-11.287 8.6455,-12.693 5.0591,-1.406 9.3907,1.9973 9.675,7.6014 0.28431,5.6041 -3.5864,11.287 -8.6455,12.693 -5.0591,1.4059 -9.3907,-1.9973 -9.675,-7.6014 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69121"
- style="color:#000000;fill:url(#radialGradient6452)"
- d="m 521.09,235.82 c 0.0761,-5.9269 4.4888,-11.568 9.8562,-12.599 5.3674,-1.0311 9.6569,2.9377 9.5809,8.8646 -0.0761,5.9269 -4.4889,11.568 -9.8563,12.599 -5.3674,1.0311 -9.6569,-2.9377 -9.5808,-8.8646 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69123"
- style="color:#000000;fill:url(#radialGradient6449)"
- d="m 523.83,245.14 c 0.45637,-5.7948 5.0943,-10.935 10.359,-11.481 5.2649,-0.54596 9.163,3.7091 8.7066,9.5039 -0.45637,5.7948 -5.0944,10.935 -10.359,11.481 -5.2649,0.54596 -9.1629,-3.7091 -8.7066,-9.5039 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69125"
- style="color:#000000;fill:url(#radialGradient6446)"
- d="m 526.49,253.89 c 1.0279,-6.2084 6.4535,-11.187 12.118,-11.12 5.6648,0.0672 9.4237,5.1546 8.3958,11.363 -1.0279,6.2084 -6.4535,11.187 -12.118,11.12 -5.6648,-0.0672 -9.4237,-5.1546 -8.3957,-11.363 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69127"
- style="color:#000000;fill:url(#radialGradient6443)"
- d="m 530.61,262.1 c 1.6101,-6.1974 7.5206,-10.594 13.202,-9.8204 5.6809,0.77369 8.9809,6.4248 7.3708,12.622 -1.6101,6.1973 -7.5207,10.594 -13.202,9.8204 -5.6809,-0.77369 -8.9809,-6.4248 -7.3707,-12.622 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69129"
- style="color:#000000;fill:url(#radialGradient6440)"
- d="m 536.35,269.9 c 2.1217,-5.6584 8.0702,-9.0337 13.286,-7.5389 5.2161,1.4948 7.7246,7.2936 5.6028,12.952 -2.1217,5.6584 -8.0702,9.0337 -13.286,7.5389 -5.2161,-1.4948 -7.7245,-7.2936 -5.6028,-12.952 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69131"
- style="color:#000000;fill:url(#radialGradient6437)"
- d="m 542.13,277.91 c 2.447,-5.6176 8.641,-8.6344 13.835,-6.7383 5.1937,1.8961 7.4203,7.9871 4.9733,13.605 -2.447,5.6176 -8.641,8.6344 -13.835,6.7383 -5.1937,-1.8961 -7.4203,-7.9871 -4.9733,-13.605 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69133"
- style="color:#000000;fill:url(#radialGradient6434)"
- d="m 548.75,284.35 c 3.3313,-5.5066 10.193,-7.5492 15.326,-4.5622 5.1329,2.987 6.5934,9.8724 3.2622,15.379 -3.3313,5.5066 -10.193,7.5492 -15.326,4.5622 -5.1329,-2.987 -6.5934,-9.8724 -3.2621,-15.379 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69135"
- style="color:#000000;fill:url(#radialGradient6431)"
- d="m 556.81,292.49 c 3.1805,-5.0594 9.5863,-6.8185 14.308,-3.9292 4.7214,2.8894 5.9705,9.333 2.7899,14.392 -3.1805,5.0594 -9.5863,6.8185 -14.308,3.9292 -4.7214,-2.8894 -5.9704,-9.333 -2.7899,-14.392 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69137"
- style="color:#000000;fill:url(#radialGradient6428)"
- d="m 565.27,299.28 c 3.5326,-4.8268 10.066,-6.0164 14.592,-2.657 4.5266,3.3593 5.3325,9.9955 1.8,14.822 -3.5326,4.8268 -10.066,6.0164 -14.592,2.657 -4.5266,-3.3593 -5.3325,-9.9955 -1.7999,-14.822 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69139"
- style="color:#000000;fill:url(#radialGradient6425)"
- d="m 574.77,305.03 c 4.1741,-4.4182 10.951,-4.5847 15.137,-0.37176 4.1857,4.2129 4.195,11.21 0.021,15.628 -4.1741,4.4182 -10.951,4.5846 -15.137,0.37172 -4.1856,-4.2129 -4.195,-11.21 -0.0209,-15.628 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69141"
- style="color:#000000;fill:url(#radialGradient6422)"
- d="m 584.38,311.72 c 4.2813,-4.4837 11.197,-4.608 15.447,-0.27776 4.2497,4.3303 4.224,11.475 -0.0573,15.959 -4.2813,4.4837 -11.197,4.608 -15.447,0.27773 -4.2497,-4.3303 -4.224,-11.475 0.0573,-15.959 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69149"
- style="color:#000000;fill:url(#radialGradient6419)"
- d="m 536.05,172.66 c -1.8072,-4.5935 0.0322,-10.796 4.1085,-13.853 4.0763,-3.057 8.8458,-1.8114 10.653,2.7821 1.8072,4.5935 -0.0322,10.796 -4.1085,13.853 -4.0763,3.057 -8.8458,1.8114 -10.653,-2.7822 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69151"
- style="color:#000000;fill:url(#radialGradient6416)"
- d="m 533.3,184.66 c -1.5778,-4.9316 0.704,-11.234 5.0965,-14.078 4.3925,-2.8435 9.2323,-1.1507 10.81,3.7808 1.5778,4.9316 -0.70402,11.234 -5.0965,14.078 -4.3925,2.8435 -9.2323,1.1507 -10.81,-3.7809 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69153"
- style="color:#000000;fill:url(#radialGradient6413)"
- d="m 530.94,195.25 c -0.81773,-5.4962 2.522,-11.598 7.4595,-13.629 4.9375,-2.0309 9.603,0.77827 10.421,6.2744 0.81773,5.4962 -2.522,11.598 -7.4595,13.629 -4.9375,2.0309 -9.603,-0.77828 -10.421,-6.2744 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69155"
- style="color:#000000;fill:url(#radialGradient6410)"
- d="m 530.7,206.52 c -0.6926,-5.2627 2.5818,-11.017 7.3136,-12.852 4.7318,-1.8352 9.1292,0.94324 9.8218,6.2059 0.69259,5.2627 -2.5819,11.017 -7.3137,12.852 -4.7318,1.8352 -9.1292,-0.94325 -9.8218,-6.206 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69157"
- style="color:#000000;fill:url(#radialGradient6407)"
- d="m 529.93,217.31 c -0.36339,-5.8517 3.622,-11.851 8.9017,-13.399 5.2796,-1.5486 9.8543,1.9398 10.218,7.7916 0.36339,5.8517 -3.622,11.851 -8.9017,13.399 -5.2797,1.5486 -9.8542,-1.9398 -10.218,-7.7916 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69159"
- style="color:#000000;fill:url(#radialGradient6404)"
- d="m 531.34,226.08 c 0.58617,-5.5124 5.1269,-10.253 10.142,-10.588 5.0151,-0.3354 8.6055,3.8614 8.0193,9.3738 -0.58617,5.5124 -5.1269,10.253 -10.142,10.588 -5.0151,0.33539 -8.6055,-3.8614 -8.0193,-9.3738 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69161"
- style="color:#000000;fill:url(#radialGradient6401)"
- d="m 533,235.77 c 0.99335,-5.5635 5.9165,-9.954 10.996,-9.8065 5.0796,0.14755 8.3922,4.7773 7.3989,10.341 -0.99335,5.5635 -5.9165,9.954 -10.996,9.8065 -5.0796,-0.14755 -8.3922,-4.7773 -7.3989,-10.341 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69163"
- style="color:#000000;fill:url(#radialGradient6398)"
- d="m 534.93,245.86 c 1.1003,-5.968 6.4106,-10.644 11.861,-10.443 5.4504,0.20027 8.977,5.2006 7.8767,11.169 -1.1003,5.968 -6.4107,10.644 -11.861,10.443 -5.4504,-0.20026 -8.977,-5.2006 -7.8767,-11.169 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69165"
- style="color:#000000;fill:url(#radialGradient6395)"
- d="m 538.55,253.94 c 1.8836,-5.757 7.7028,-9.461 12.997,-8.273 5.2947,1.188 8.0599,6.8181 6.1763,12.575 -1.8836,5.757 -7.7028,9.461 -12.997,8.273 -5.2947,-1.188 -8.0598,-6.8181 -6.1762,-12.575 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69167"
- style="color:#000000;fill:url(#radialGradient6392)"
- d="m 542.88,262.38 c 2.334,-5.618 8.4327,-8.7461 13.622,-6.9868 5.189,1.7593 7.5035,7.7399 5.1694,13.358 -2.334,5.618 -8.4327,8.7461 -13.622,6.9868 -5.189,-1.7593 -7.5034,-7.7398 -5.1694,-13.358 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69169"
- style="color:#000000;fill:url(#radialGradient6389)"
- d="m 547.51,270.73 c 2.7066,-5.7966 9.2519,-8.7315 14.619,-6.5553 5.3674,2.1762 7.5244,8.6396 4.8177,14.436 -2.7066,5.7966 -9.2519,8.7315 -14.619,6.5553 -5.3674,-2.1762 -7.5243,-8.6395 -4.8177,-14.436 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69171"
- style="color:#000000;fill:url(#radialGradient6386)"
- d="m 553.39,278.76 c 3.011,-5.6982 9.7418,-8.2398 15.034,-5.6766 5.292,2.5631 7.1411,9.2602 4.1302,14.958 -3.011,5.6982 -9.7418,8.2398 -15.034,5.6766 -5.292,-2.5631 -7.1411,-9.2602 -4.1301,-14.958 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69173"
- style="color:#000000;fill:url(#radialGradient6383)"
- d="m 560.4,285.65 c 3.6444,-5.3569 10.661,-6.9479 15.673,-3.5537 5.0114,3.3942 6.1196,10.488 2.4752,15.845 -3.6444,5.3569 -10.661,6.9479 -15.673,3.5537 -5.0114,-3.3942 -6.1196,-10.488 -2.4751,-15.845 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69175"
- style="color:#000000;fill:url(#radialGradient6380)"
- d="m 568.6,292.98 c 3.8572,-4.7906 10.639,-5.627 15.147,-1.8681 4.5085,3.7589 5.0365,10.69 1.1793,15.48 -3.8572,4.7906 -10.639,5.627 -15.147,1.8681 -4.5085,-3.7589 -5.0365,-10.69 -1.1793,-15.48 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69177"
- style="color:#000000;fill:url(#radialGradient6377)"
- d="m 576.6,299.81 c 4.2404,-4.8474 11.388,-5.3626 15.965,-1.1508 4.577,4.2118 4.8499,11.556 0.60952,16.403 -4.2404,4.8474 -11.388,5.3626 -15.965,1.1508 -4.577,-4.2118 -4.8499,-11.556 -0.60949,-16.403 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69179"
- style="color:#000000;fill:url(#radialGradient6374)"
- d="m 587.15,305.92 c 4.5999,-3.7945 11.28,-2.9418 14.92,1.9045 3.6402,4.8463 2.8623,11.851 -1.7376,15.645 -4.5999,3.7945 -11.28,2.9418 -14.92,-1.9045 -3.6402,-4.8463 -2.8622,-11.851 1.7376,-15.645 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69189"
- style="color:#000000;fill:url(#radialGradient6371)"
- d="m 546.74,173.44 c -1.1461,-5.0188 1.5653,-10.982 6.0561,-13.32 4.4908,-2.3377 9.0604,-0.16422 10.206,4.8546 1.1461,5.0188 -1.5654,10.982 -6.0562,13.32 -4.4908,2.3377 -9.0604,0.16421 -10.206,-4.8546 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69191"
- style="color:#000000;fill:url(#radialGradient6368)"
- d="m 544.06,185.81 c -1.1016,-5.3344 1.8789,-11.559 6.6573,-13.902 4.7784,-2.3438 9.5451,0.0807 10.647,5.415 1.1016,5.3344 -1.879,11.559 -6.6573,13.903 -4.7784,2.3437 -9.5451,-0.0807 -10.647,-5.4151 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69193"
- style="color:#000000;fill:url(#radialGradient6365)"
- d="m 541.57,196.27 c -0.2618,-5.9716 3.8976,-11.987 9.2902,-13.435 5.3927,-1.4484 9.9765,2.2184 10.238,8.19 0.2618,5.9716 -3.8976,11.987 -9.2903,13.435 -5.3927,1.4484 -9.9765,-2.2184 -10.238,-8.19 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69195"
- style="color:#000000;fill:url(#radialGradient6362)"
- d="m 541.23,207.09 c 0.0887,-5.7861 4.4089,-11.279 9.6494,-12.268 5.2405,-0.98915 9.4169,2.8996 9.3282,8.6857 -0.0887,5.7861 -4.4089,11.279 -9.6495,12.268 -5.2405,0.98914 -9.4169,-2.8996 -9.3282,-8.6857 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69197"
- style="color:#000000;fill:url(#radialGradient6359)"
- d="m 541.6,217.21 c 0.60136,-5.6399 5.2485,-10.488 10.38,-10.83 5.1312,-0.34118 8.8033,3.9543 8.202,9.5941 -0.60136,5.6399 -5.2485,10.488 -10.38,10.83 -5.1312,0.34118 -8.8033,-3.9543 -8.2019,-9.5941 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69199"
- style="color:#000000;fill:url(#radialGradient6356)"
- d="m 542.44,228.33 c 0.51303,-5.7404 5.1591,-10.773 10.377,-11.24 5.2182,-0.46709 9.0324,3.8078 8.5194,9.5481 -0.51303,5.7404 -5.1591,10.773 -10.377,11.24 -5.2182,0.46709 -9.0324,-3.8078 -8.5194,-9.5481 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69201"
- style="color:#000000;fill:url(#radialGradient6353)"
- d="m 543.53,238.03 c 0.97873,-6.1482 6.3184,-11.117 11.926,-11.098 5.6081,0.0191 9.361,5.0186 8.3822,11.167 -0.97872,6.1482 -6.3184,11.117 -11.927,11.098 -5.6081,-0.0191 -9.3609,-5.0186 -8.3822,-11.167 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69203"
- style="color:#000000;fill:url(#radialGradient6350)"
- d="m 546.81,246.18 c 1.8487,-5.6388 7.5516,-9.263 12.738,-8.0948 5.1861,1.1682 7.8916,6.6864 6.0429,12.325 -1.8487,5.6388 -7.5516,9.263 -12.738,8.0948 -5.1861,-1.1682 -7.8916,-6.6864 -6.0428,-12.325 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69205"
- style="color:#000000;fill:url(#radialGradient6347)"
- d="m 550.52,255.35 c 2.1092,-5.4022 7.8591,-8.5428 12.843,-7.0146 4.9837,1.5282 7.3139,7.1464 5.2047,12.549 -2.1092,5.4023 -7.8591,8.5428 -12.843,7.0146 -4.9837,-1.5282 -7.3139,-7.1464 -5.2047,-12.549 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69207"
- style="color:#000000;fill:url(#radialGradient6344)"
- d="m 554.94,263.71 c 2.5842,-5.2048 8.5916,-7.6891 13.418,-5.5488 4.8263,2.1403 6.6438,8.0947 4.0596,13.299 -2.5842,5.2048 -8.5916,7.6891 -13.418,5.5488 -4.8263,-2.1403 -6.6438,-8.0947 -4.0596,-13.299 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69209"
- style="color:#000000;fill:url(#radialGradient6341)"
- d="m 559.2,271.81 c 3.1174,-5.6121 9.8752,-7.9663 15.094,-5.2581 5.2188,2.7082 6.9224,9.4531 3.805,15.065 -3.1174,5.6121 -9.8752,7.9662 -15.094,5.2581 -5.2188,-2.7082 -6.9224,-9.4531 -3.805,-15.065 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69211"
- style="color:#000000;fill:url(#radialGradient6338)"
- d="m 566.12,279.31 c 3.5585,-4.8384 10.122,-6.0138 14.661,-2.6253 4.5383,3.3885 5.3327,10.058 1.7742,14.896 -3.5585,4.8384 -10.122,6.0138 -14.661,2.6253 -4.5383,-3.3885 -5.3326,-10.058 -1.7742,-14.896 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69213"
- style="color:#000000;fill:url(#radialGradient6335)"
- d="m 572.3,286.52 c 4.1306,-5.0294 11.319,-5.8279 16.056,-1.7834 4.7368,4.0445 5.2283,11.4 1.0978,16.43 -4.1306,5.0294 -11.319,5.8279 -16.056,1.7834 -4.7368,-4.0445 -5.2283,-11.4 -1.0977,-16.43 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69215"
- style="color:#000000;fill:url(#radialGradient6332)"
- d="m 580.7,294.04 c 4.2318,-4.3488 11.007,-4.3915 15.132,-0.0956 4.1254,4.296 4.039,11.304 -0.19279,15.653 -4.2318,4.3488 -11.007,4.3915 -15.132,0.0955 -4.1254,-4.296 -4.039,-11.304 0.19281,-15.653 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69217"
- style="color:#000000;fill:url(#radialGradient6329)"
- d="m 589.06,300.72 c 4.6469,-4.1758 11.646,-3.6446 15.634,1.1863 3.9874,4.8309 3.4528,12.132 -1.1941,16.308 -4.6469,4.1758 -11.646,3.6446 -15.634,-1.1863 -3.9874,-4.8309 -3.4528,-12.132 1.1942,-16.308 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69219"
- style="color:#000000;fill:url(#radialGradient6326)"
- d="m 598.33,308.26 c 4.4731,-3.9698 11.174,-3.4106 14.968,1.2491 3.7932,4.6597 3.2421,11.655 -1.231,15.625 -4.4731,3.9698 -11.174,3.4106 -14.968,-1.2491 -3.7932,-4.6597 -3.2421,-11.655 1.231,-15.625 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69229"
- style="color:#000000;fill:url(#radialGradient6323)"
- d="m 557.84,174.79 c -0.79302,-5.2179 2.3635,-11.027 7.0503,-12.976 4.6868,-1.9483 9.1291,0.70232 9.9221,5.9203 0.79301,5.2179 -2.3636,11.027 -7.0504,12.976 -4.6868,1.9483 -9.1291,-0.70233 -9.9221,-5.9203 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69231"
- style="color:#000000;fill:url(#radialGradient6320)"
- d="m 554.65,187.25 c -0.73725,-5.8529 2.9324,-12.22 8.1963,-14.221 5.264,-2.0011 10.129,1.1214 10.866,6.9743 0.73725,5.8529 -2.9324,12.22 -8.1964,14.221 -5.264,2.0011 -10.129,-1.1214 -10.866,-6.9743 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69233"
- style="color:#000000;fill:url(#radialGradient6317)"
- d="m 553.03,197.86 c -0.0644,-5.9479 4.2448,-11.747 9.6249,-12.952 5.3801,-1.2051 9.7938,2.6397 9.8583,8.5876 0.0644,5.9479 -4.2448,11.747 -9.6249,12.952 -5.3801,1.2051 -9.7938,-2.6397 -9.8582,-8.5876 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69235"
- style="color:#000000;fill:url(#radialGradient6314)"
- d="m 552.96,208.2 c 0.4788,-5.5708 4.9714,-10.473 10.035,-10.949 5.0631,-0.47638 8.7795,3.6534 8.3007,9.2242 -0.47879,5.5708 -4.9714,10.473 -10.035,10.949 -5.0631,0.47637 -8.7795,-3.6535 -8.3007,-9.2242 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69237"
- style="color:#000000;fill:url(#radialGradient6311)"
- d="m 553.03,218.64 c 0.87817,-5.624 5.7481,-10.186 10.877,-10.189 5.1292,-0.003 8.5754,4.5532 7.6972,10.177 -0.87816,5.624 -5.7481,10.186 -10.877,10.189 -5.1292,0.003 -8.5753,-4.5532 -7.6972,-10.177 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69239"
- style="color:#000000;fill:url(#radialGradient6308)"
- d="m 553.08,229.4 c 1.0413,-6.212 6.4807,-11.181 12.149,-11.098 5.6686,0.0827 9.4198,5.1855 8.3785,11.397 -1.0413,6.212 -6.4808,11.181 -12.149,11.098 -5.6686,-0.0827 -9.4198,-5.1855 -8.3785,-11.397 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69241"
- style="color:#000000;fill:url(#radialGradient6305)"
- d="m 555.66,238.13 c 1.7992,-5.6505 7.4687,-9.3345 12.663,-8.2284 5.1945,1.1061 7.9469,6.5834 6.1476,12.234 -1.7992,5.6505 -7.4687,9.3345 -12.663,8.2284 -5.1945,-1.1061 -7.9468,-6.5834 -6.1476,-12.234 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69243"
- style="color:#000000;fill:url(#radialGradient6302)"
- d="m 558.44,247.56 c 2.1244,-5.5012 7.9598,-8.7224 13.034,-7.1946 5.074,1.5278 7.4651,7.2259 5.3407,12.727 -2.1244,5.5012 -7.9598,8.7224 -13.034,7.1946 -5.074,-1.5278 -7.465,-7.2259 -5.3406,-12.727 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69245"
- style="color:#000000;fill:url(#radialGradient6299)"
- d="m 561.67,256.62 c 2.4895,-5.562 8.6787,-8.4835 13.824,-6.5255 5.1453,1.958 7.2982,8.0542 4.8087,13.616 -2.4895,5.562 -8.6787,8.4835 -13.824,6.5255 -5.1453,-1.958 -7.2982,-8.0542 -4.8086,-13.616 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69247"
- style="color:#000000;fill:url(#radialGradient6296)"
- d="m 566.21,264.69 c 3.091,-5.2784 9.5816,-7.3366 14.497,-4.5971 4.9156,2.7395 6.3947,9.2393 3.3038,14.518 -3.091,5.2784 -9.5816,7.3366 -14.497,4.5971 -4.9156,-2.7395 -6.3947,-9.2392 -3.3037,-14.518 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69249"
- style="color:#000000;fill:url(#radialGradient6293)"
- d="m 571.03,273.55 c 3.2045,-5.3599 9.8511,-7.3853 14.845,-4.5238 4.9944,2.8614 6.4454,9.5261 3.2409,14.886 -3.2045,5.3599 -9.8511,7.3853 -14.846,4.5238 -4.9944,-2.8614 -6.4454,-9.5261 -3.2409,-14.886 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69251"
- style="color:#000000;fill:url(#radialGradient6290)"
- d="m 576.94,280.49 c 4.0161,-5.2034 11.235,-6.2819 16.124,-2.4089 4.8892,3.873 5.5969,11.231 1.5809,16.434 -4.0161,5.2034 -11.235,6.2819 -16.124,2.4089 -4.8892,-3.873 -5.5969,-11.231 -1.5808,-16.434 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69253"
- style="color:#000000;fill:url(#radialGradient6287)"
- d="m 583.9,288.47 c 4.1425,-4.9324 11.27,-5.6255 15.919,-1.5482 4.6496,4.0773 5.0606,11.381 0.91804,16.314 -4.1425,4.9324 -11.27,5.6255 -15.919,1.5482 -4.6496,-4.0773 -5.0606,-11.381 -0.91802,-16.314 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69255"
- style="color:#000000;fill:url(#radialGradient6284)"
- d="m 591.5,295.57 c 4.531,-4.7375 11.844,-4.8616 16.335,-0.27728 4.4906,4.5843 4.4577,12.141 -0.0733,16.879 -4.531,4.7374 -11.845,4.8616 -16.335,0.27725 -4.4906,-4.5843 -4.4577,-12.141 0.0733,-16.879 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69257"
- style="color:#000000;fill:url(#radialGradient6281)"
- d="m 601.13,301.22 c 5.2897,-3.732 12.508,-2.1424 16.123,3.5504 3.6146,5.6928 2.2566,13.333 -3.0331,17.065 -5.2897,3.732 -12.508,2.1424 -16.123,-3.5504 -3.6146,-5.6928 -2.2566,-13.333 3.0332,-17.065 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69269"
- style="color:#000000;fill:url(#radialGradient6278)"
- d="m 569.07,176.81 c -0.77712,-5.3486 2.4887,-11.268 7.2945,-13.222 4.8058,-1.9538 9.3316,0.79825 10.109,6.1468 0.77711,5.3486 -2.4888,11.268 -7.2945,13.222 -4.8058,1.9538 -9.3316,-0.79825 -10.109,-6.1468 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69271"
- style="color:#000000;fill:url(#radialGradient6275)"
- d="m 565.94,188.48 c -0.35259,-5.9208 3.6926,-11.976 9.0353,-13.524 5.3426,-1.5486 9.9596,1.9958 10.312,7.9166 0.35259,5.9208 -3.6927,11.976 -9.0353,13.524 -5.3426,1.5486 -9.9595,-1.9958 -10.312,-7.9166 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69273"
- style="color:#000000;fill:url(#radialGradient6272)"
- d="m 564.39,199.62 c 0.0626,-5.9937 4.513,-11.712 9.9401,-12.772 5.4272,-1.0601 9.7761,2.9394 9.7135,8.9331 -0.0626,5.9937 -4.513,11.712 -9.9402,12.772 -5.4272,1.06 -9.776,-2.9394 -9.7134,-8.9331 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69275"
- style="color:#000000;fill:url(#radialGradient6269)"
- d="m 563.72,210.21 c 0.55714,-6.005 5.4347,-11.249 10.894,-11.713 5.4597,-0.46387 9.434,4.0281 8.8768,10.033 -0.55715,6.005 -5.4348,11.249 -10.894,11.713 -5.4597,0.46387 -9.4339,-4.0282 -8.8768,-10.033 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69277"
- style="color:#000000;fill:url(#radialGradient6266)"
- d="m 564.58,219.67 c 1.3277,-5.5232 6.5044,-9.547 11.563,-8.9873 5.0582,0.55972 8.0823,5.4909 6.7546,11.014 -1.3277,5.5232 -6.5045,9.547 -11.563,8.9873 -5.0582,-0.55972 -8.0823,-5.4909 -6.7546,-11.014 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69279"
- style="color:#000000;fill:url(#radialGradient6263)"
- d="m 565.46,230.31 c 1.4575,-5.5887 6.7921,-9.5482 11.915,-8.8438 5.1232,0.70433 8.0948,5.8058 6.6374,11.394 -1.4575,5.5886 -6.7922,9.5482 -11.915,8.8438 -5.1232,-0.70433 -8.0948,-5.8058 -6.6373,-11.394 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69281"
- style="color:#000000;fill:url(#radialGradient6260)"
- d="m 567.33,239.89 c 1.8929,-5.499 7.5306,-8.945 12.592,-7.6969 5.0616,1.2481 7.6303,6.7178 5.7374,12.217 -1.8929,5.499 -7.5306,8.945 -12.592,7.6969 -5.0616,-1.2481 -7.6303,-6.7178 -5.7374,-12.217 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69283"
- style="color:#000000;fill:url(#radialGradient6257)"
- d="m 569.75,248.26 c 2.7536,-5.5404 9.1507,-8.182 14.288,-5.9003 5.1376,2.2817 7.0701,8.6228 4.3165,14.163 -2.7536,5.5404 -9.1507,8.182 -14.288,5.9003 -5.1376,-2.2817 -7.0701,-8.6228 -4.3164,-14.163 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69285"
- style="color:#000000;fill:url(#radialGradient6254)"
- d="m 572.97,257.23 c 3.1631,-5.6062 9.9552,-7.9097 15.171,-5.145 5.2154,2.7646 6.8792,9.5505 3.7161,15.157 -3.1631,5.6062 -9.9552,7.9096 -15.171,5.145 -5.2154,-2.7646 -6.8792,-9.5505 -3.7161,-15.157 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69287"
- style="color:#000000;fill:url(#radialGradient6251)"
- d="m 578.02,265.76 c 3.492,-5.0189 10.132,-6.4335 14.831,-3.1596 4.6987,3.2739 5.6769,9.9965 2.1849,15.015 -3.492,5.0189 -10.132,6.4335 -14.831,3.1596 -4.6987,-3.2739 -5.6769,-9.9965 -2.1849,-15.015 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69289"
- style="color:#000000;fill:url(#radialGradient6248)"
- d="m 582.39,274.28 c 3.8154,-5.3679 10.985,-6.8018 16.014,-3.2027 5.029,3.5991 6.0128,10.868 2.1974,16.236 -3.8154,5.3679 -10.985,6.8018 -16.014,3.2027 -5.029,-3.5991 -6.0128,-10.868 -2.1974,-16.236 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69291"
- style="color:#000000;fill:url(#radialGradient6245)"
- d="m 589.32,282.79 c 3.7812,-4.6232 10.376,-5.3727 14.729,-1.6739 4.3536,3.6987 4.8176,10.445 1.0364,15.068 -3.7812,4.6232 -10.376,5.3726 -14.729,1.6739 -4.3536,-3.6987 -4.8175,-10.445 -1.0364,-15.068 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69293"
- style="color:#000000;fill:url(#radialGradient6242)"
- d="m 596.57,288.68 c 4.8573,-4.0962 11.977,-3.2821 15.901,1.8185 3.9248,5.1006 3.169,12.556 -1.6883,16.652 -4.8573,4.0962 -11.977,3.282 -15.901,-1.8185 -3.9248,-5.1006 -3.169,-12.556 1.6883,-16.652 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69295"
- style="color:#000000;fill:url(#radialGradient6239)"
- d="m 604.4,295.92 c 5.1488,-3.7636 12.271,-2.3427 15.908,3.1736 3.6368,5.5163 2.4112,13.039 -2.7377,16.803 -5.1488,3.7636 -12.271,2.3427 -15.908,-3.1737 -3.6368,-5.5163 -2.4111,-13.039 2.7377,-16.803 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69297"
- style="color:#000000;fill:url(#radialGradient6236)"
- d="m 613.75,303.21 c 5.1715,-2.9896 11.745,-0.8002 14.682,4.8902 2.9374,5.6904 1.1263,12.727 -4.0451,15.717 -5.1715,2.9896 -11.745,0.80016 -14.682,-4.8902 -2.9374,-5.6904 -1.1263,-12.727 4.0452,-15.716 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69309"
- style="color:#000000;fill:url(#radialGradient6233)"
- d="m 579.23,177.25 c 0.10428,-6.103 4.6701,-11.886 10.198,-12.916 5.528,-1.0304 9.9248,3.0818 9.8206,9.1848 -0.10428,6.103 -4.6702,11.886 -10.198,12.916 -5.528,1.0304 -9.9248,-3.0818 -9.8205,-9.1848 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69311"
- style="color:#000000;fill:url(#radialGradient6230)"
- d="m 577.67,189.39 c 0.13445,-5.7021 4.4317,-11.069 9.5983,-11.986 5.1665,-0.91788 9.2459,2.9605 9.1114,8.6626 -0.13445,5.7021 -4.4318,11.069 -9.5983,11.986 -5.1665,0.91787 -9.2458,-2.9605 -9.1114,-8.6626 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69313"
- style="color:#000000;fill:url(#radialGradient6227)"
- d="m 575.62,199.97 c 0.86804,-6.0719 6.058,-11.075 11.592,-11.176 5.5341,-0.10037 9.3166,4.7405 8.4486,10.812 -0.86805,6.0718 -6.058,11.075 -11.592,11.176 -5.5341,0.10037 -9.3166,-4.7405 -8.4486,-10.812 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69315"
- style="color:#000000;fill:url(#radialGradient6224)"
- d="m 575.69,210.64 c 1.2386,-5.6157 6.4076,-9.816 11.545,-9.3816 5.1378,0.43436 8.2988,5.3389 7.0602,10.955 -1.2386,5.6157 -6.4077,9.816 -11.546,9.3816 -5.1378,-0.43436 -8.2988,-5.3389 -7.0602,-10.955 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69317"
- style="color:#000000;fill:url(#radialGradient6221)"
- d="m 575.42,220.43 c 1.9827,-5.863 7.9634,-9.5719 13.358,-8.2841 5.395,1.2878 8.1612,7.0846 6.1785,12.948 -1.9827,5.863 -7.9634,9.5719 -13.358,8.2841 -5.395,-1.2878 -8.1612,-7.0846 -6.1785,-12.948 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69319"
- style="color:#000000;fill:url(#radialGradient6218)"
- d="m 576.47,231.46 c 1.9089,-5.8288 7.802,-9.5771 13.163,-8.3722 5.3607,1.205 8.159,6.9069 6.2502,12.736 -1.9089,5.8288 -7.802,9.5771 -13.163,8.3721 -5.3607,-1.205 -8.159,-6.9069 -6.2501,-12.736 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69321"
- style="color:#000000;fill:url(#radialGradient6215)"
- d="m 578.39,241.14 c 2.2948,-5.7167 8.4325,-8.9785 13.709,-7.2854 5.2766,1.6931 7.6938,7.6999 5.3991,13.417 -2.2948,5.7167 -8.4325,8.9785 -13.709,7.2854 -5.2766,-1.6931 -7.6938,-7.6999 -5.399,-13.417 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69323"
- style="color:#000000;fill:url(#radialGradient6212)"
- d="m 581.24,249.45 c 3.1351,-5.4831 9.8132,-7.6954 14.916,-4.9414 5.1028,2.7541 6.698,9.4316 3.5629,14.915 -3.1351,5.4831 -9.8133,7.6954 -14.916,4.9413 -5.1028,-2.7541 -6.698,-9.4316 -3.5629,-14.915 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69325"
- style="color:#000000;fill:url(#radialGradient6209)"
- d="m 584.73,257.98 c 3.7207,-5.362 10.806,-6.8832 15.825,-3.3977 5.0195,3.4855 6.0724,10.658 2.3517,16.02 -3.7207,5.362 -10.806,6.8832 -15.825,3.3977 -5.0195,-3.4855 -6.0723,-10.658 -2.3516,-16.02 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69327"
- style="color:#000000;fill:url(#radialGradient6206)"
- d="m 589.68,267.87 c 3.4232,-4.883 9.9051,-6.234 14.478,-3.0176 4.5726,3.2164 5.5044,9.7822 2.0812,14.665 -3.4232,4.883 -9.9051,6.234 -14.478,3.0176 -4.5726,-3.2164 -5.5043,-9.7822 -2.0811,-14.665 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69329"
- style="color:#000000;fill:url(#radialGradient6203)"
- d="m 595.35,275.5 c 4.0246,-4.3919 10.656,-4.6796 14.811,-0.64251 4.1552,4.0371 4.261,10.87 0.23635,15.262 -4.0246,4.3919 -10.656,4.6796 -14.811,0.64249 -4.1552,-4.0371 -4.261,-10.87 -0.23632,-15.262 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69331"
- style="color:#000000;fill:url(#radialGradient6200)"
- d="m 601.09,283.49 c 4.359,-4.3714 11.258,-4.3112 15.41,0.1344 4.1515,4.4456 3.9833,11.593 -0.37574,15.964 -4.359,4.3714 -11.258,4.3112 -15.41,-0.13443 -4.1515,-4.4456 -3.9833,-11.593 0.37576,-15.964 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69333"
- style="color:#000000;fill:url(#radialGradient6197)"
- d="m 608.66,290.9 c 4.6874,-3.7003 11.372,-2.6709 14.931,2.2992 3.5589,4.9701 2.644,11.999 -2.0434,15.699 -4.6874,3.7003 -11.372,2.6709 -14.931,-2.2992 -3.5589,-4.9701 -2.644,-11.999 2.0434,-15.699 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69335"
- style="color:#000000;fill:url(#radialGradient6194)"
- d="m 616.02,297.95 c 5.1248,-3.652 12.145,-2.1472 15.68,3.3612 3.5348,5.5084 2.2459,12.934 -2.8789,16.586 -5.1248,3.652 -12.145,2.1471 -15.68,-3.3613 -3.5348,-5.5084 -2.2459,-12.934 2.8789,-16.586 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69349"
- style="color:#000000;fill:url(#radialGradient6191)"
- d="m 591.17,178.3 c 0.49887,-5.7592 5.1467,-10.823 10.381,-11.311 5.2346,-0.48778 9.0736,3.7855 8.5747,9.5447 -0.49887,5.7592 -5.1467,10.823 -10.381,11.311 -5.2346,0.48778 -9.0736,-3.7855 -8.5747,-9.5447 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69351"
- style="color:#000000;fill:url(#radialGradient6187)"
- d="m 589.17,189.54 c 1.0006,-5.6019 5.9581,-10.022 11.073,-9.8733 5.1147,0.14909 8.4499,4.8112 7.4492,10.413 -1.0006,5.6019 -5.9581,10.022 -11.073,9.8732 -5.1147,-0.14908 -8.4498,-4.8112 -7.4492,-10.413 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69353"
- style="color:#000000;fill:url(#radialGradient6184)"
- d="m 586.88,201.84 c 0.95227,-6.1794 6.2924,-11.204 11.928,-11.223 5.6351,-0.0188 9.4314,4.9752 8.4791,11.155 -0.95227,6.1794 -6.2924,11.204 -11.928,11.223 -5.6351,0.0189 -9.4313,-4.9752 -8.479,-11.155 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69355"
- style="color:#000000;fill:url(#radialGradient6181)"
- d="m 587.22,212.04 c 1.5183,-5.5427 6.8707,-9.3983 11.955,-8.6117 5.0843,0.78661 7.9752,5.9175 6.4569,11.46 -1.5183,5.5427 -6.8708,9.3983 -11.955,8.6117 -5.0843,-0.7866 -7.9752,-5.9175 -6.4569,-11.46 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69357"
- style="color:#000000;fill:url(#radialGradient6178)"
- d="m 586.94,221.74 c 2.303,-5.7875 8.4996,-9.1095 13.841,-7.4198 5.341,1.6896 7.8038,7.751 5.5009,13.539 -2.303,5.7875 -8.4997,9.1095 -13.841,7.4198 -5.341,-1.6896 -7.8038,-7.751 -5.5008,-13.539 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69359"
- style="color:#000000;fill:url(#radialGradient6175)"
- d="m 587.95,231.99 c 2.6029,-5.7589 9.0326,-8.7591 14.361,-6.7012 5.3286,2.0579 7.5382,8.3947 4.9353,14.154 -2.6029,5.7589 -9.0326,8.7591 -14.361,6.7012 -5.3286,-2.0579 -7.5382,-8.3947 -4.9353,-14.154 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69361"
- style="color:#000000;fill:url(#radialGradient6172)"
- d="m 590.63,241.09 c 3.1776,-5.1472 9.6454,-6.9938 14.446,-4.1246 4.8007,2.8692 6.1164,9.3678 2.9388,14.515 -3.1776,5.1472 -9.6454,6.9938 -14.446,4.1246 -4.8007,-2.8692 -6.1164,-9.3678 -2.9388,-14.515 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69363"
- style="color:#000000;fill:url(#radialGradient6169)"
- d="m 592.62,251.05 c 3.3356,-5.5095 10.203,-7.5507 15.339,-4.5591 5.1357,2.9916 6.595,9.8831 3.2595,15.393 -3.3355,5.5095 -10.203,7.5506 -15.339,4.559 -5.1357,-2.9916 -6.595,-9.8831 -3.2594,-15.393 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69365"
- style="color:#000000;fill:url(#radialGradient6166)"
- d="m 596.94,259.38 c 3.9237,-4.8629 10.815,-5.7037 15.392,-1.878 4.5768,3.8257 5.1064,10.869 1.1827,15.732 -3.9237,4.8629 -10.815,5.7036 -15.392,1.8779 -4.5768,-3.8257 -5.1063,-10.869 -1.1826,-15.732 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69367"
- style="color:#000000;fill:url(#radialGradient6163)"
- d="m 601.24,268.71 c 3.9578,-4.7706 10.81,-5.4889 15.305,-1.6044 4.4949,3.8845 4.9302,10.901 0.97238,15.672 -3.9578,4.7706 -10.81,5.4889 -15.305,1.6044 -4.4949,-3.8845 -4.9302,-10.901 -0.97235,-15.672 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69369"
- style="color:#000000;fill:url(#radialGradient6160)"
- d="m 607.23,276.73 c 4.3416,-4.0926 11.021,-3.7808 14.92,0.69647 3.8985,4.4773 3.5393,11.425 -0.80228,15.517 -4.3416,4.0926 -11.021,3.7808 -14.92,-0.69649 -3.8985,-4.4773 -3.5392,-11.424 0.80231,-15.517 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69371"
- style="color:#000000;fill:url(#radialGradient6157)"
- d="m 613.26,284.72 c 4.6513,-3.8905 11.445,-3.0799 15.175,1.8104 3.7294,4.8903 2.982,12.009 -1.6692,15.899 -4.6513,3.8904 -11.445,3.0799 -15.175,-1.8104 -3.7294,-4.8903 -2.982,-12.008 1.6692,-15.899 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69373"
- style="color:#000000;fill:url(#radialGradient6153)"
- d="m 620.55,292.03 c 5.0563,-3.391 11.827,-1.7017 15.122,3.7732 3.2956,5.475 1.8682,12.662 -3.1881,16.053 -5.0563,3.391 -11.827,1.7017 -15.122,-3.7733 -3.2956,-5.475 -1.8682,-12.662 3.1881,-16.053 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69375"
- style="color:#000000;fill:url(#radialGradient6149)"
- d="m 627.93,299.25 c 5.4067,-3.3404 12.437,-1.2585 15.702,4.65 3.2654,5.9085 1.5296,13.406 -3.8771,16.746 -5.4066,3.3404 -12.437,1.2585 -15.702,-4.65 -3.2654,-5.9085 -1.5295,-13.406 3.8771,-16.746 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69389"
- style="color:#000000;fill:url(#radialGradient6145)"
- d="m 602.92,179.76 c 0.72609,-5.5486 5.4119,-10.187 10.466,-10.36 5.0542,-0.17298 8.5628,4.1849 7.8367,9.7335 -0.72609,5.5486 -5.4119,10.187 -10.466,10.36 -5.0542,0.17297 -8.5628,-4.1849 -7.8367,-9.7335 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69391"
- style="color:#000000;fill:url(#radialGradient6141)"
- d="m 600.21,190.53 c 1.5254,-5.8232 7.0897,-9.9423 12.428,-9.2002 5.3385,0.74208 8.4296,6.0643 6.9042,11.887 -1.5254,5.8232 -7.0897,9.9422 -12.428,9.2002 -5.3385,-0.74208 -8.4296,-6.0643 -6.9042,-11.887 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69393"
- style="color:#000000;fill:url(#radialGradient6137)"
- d="m 598.67,201.73 c 1.9141,-5.8916 7.8577,-9.6953 13.275,-8.496 5.4178,1.1994 8.2581,6.9477 6.344,12.839 -1.9141,5.8916 -7.8577,9.6953 -13.276,8.496 -5.4178,-1.1994 -8.258,-6.9477 -6.344,-12.839 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69395"
- style="color:#000000;fill:url(#radialGradient6133)"
- d="m 598.48,212.98 c 2.0419,-5.6204 7.8948,-9.0373 13.073,-7.6319 5.1781,1.4054 7.7205,7.1009 5.6786,12.721 -2.0419,5.6204 -7.8948,9.0373 -13.073,7.6319 -5.1781,-1.4054 -7.7204,-7.1009 -5.6786,-12.721 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69397"
- style="color:#000000;fill:url(#radialGradient6130)"
- d="m 598.59,223.14 c 2.5685,-5.6386 8.8808,-8.5565 14.099,-6.5174 5.2181,2.0391 7.3661,8.2631 4.7976,13.902 -2.5685,5.6386 -8.8809,8.5565 -14.099,6.5173 -5.2181,-2.0391 -7.366,-8.2631 -4.7975,-13.902 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69399"
- style="color:#000000;fill:url(#radialGradient6127)"
- d="m 599.31,233.49 c 2.8543,-5.7908 9.5204,-8.5752 14.889,-6.2191 5.3687,2.3561 7.407,8.9604 4.5527,14.751 -2.8543,5.7908 -9.5204,8.5751 -14.889,6.219 -5.3687,-2.3561 -7.407,-8.9604 -4.5526,-14.751 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69401"
- style="color:#000000;fill:url(#radialGradient6123)"
- d="m 601.55,242.9 c 3.3301,-5.4686 10.163,-7.4756 15.261,-4.4828 5.0984,2.9928 6.5319,9.8521 3.2018,15.321 -3.3301,5.4686 -10.163,7.4755 -15.261,4.4828 -5.0984,-2.9928 -6.5318,-9.852 -3.2017,-15.321 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69403"
- style="color:#000000;fill:url(#radialGradient6119)"
- d="m 604.64,252.13 c 3.7138,-5.1108 10.609,-6.3965 15.401,-2.8717 4.7918,3.5248 5.6657,10.525 1.9519,15.636 -3.7138,5.1108 -10.609,6.3965 -15.401,2.8717 -4.7918,-3.5248 -5.6657,-10.525 -1.9519,-15.636 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69405"
- style="color:#000000;fill:url(#radialGradient6115)"
- d="m 608.67,261.46 c 3.8612,-4.6865 10.57,-5.4185 14.984,-1.635 4.4144,3.7835 4.8629,10.65 1.0018,15.336 -3.8612,4.6865 -10.57,5.4185 -14.984,1.635 -4.4144,-3.7835 -4.8629,-10.65 -1.0017,-15.336 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69407"
- style="color:#000000;fill:url(#radialGradient6111)"
- d="m 613.28,269.05 c 4.6801,-4.34 11.828,-3.9348 15.966,0.90518 4.1376,4.84 3.6978,12.282 -0.98232,16.622 -4.68012,4.34 -11.828,3.9348 -15.966,-0.9052 -4.1376,-4.84 -3.6977,-12.282 0.98235,-16.622 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69409"
- style="color:#000000;fill:url(#radialGradient6107)"
- d="m 618.76,277.57 c 4.8836,-3.996 11.952,-3.0595 15.787,2.0918 3.8353,5.1513 2.9856,12.567 -1.898,16.563 -4.8836,3.996 -11.952,3.0594 -15.787,-2.0919 -3.8353,-5.1513 -2.9856,-12.567 1.898,-16.563 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69411"
- style="color:#000000;fill:url(#radialGradient6103)"
- d="m 626.21,285.42 c 5.1036,-2.9018 11.555,-0.69433 14.41,4.9306 2.8549,5.625 1.032,12.537 -4.0716,15.439 -5.1036,2.9018 -11.555,0.69429 -14.41,-4.9307 -2.8549,-5.6249 -1.032,-12.537 4.0716,-15.439 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69413"
- style="color:#000000;fill:url(#radialGradient6099)"
- d="m 632.68,293.47 c 5.2467,-2.9408 11.848,-0.63049 14.745,5.1602 2.8966,5.7907 0.99144,12.869 -4.2553,15.81 -5.2467,2.9408 -11.848,0.63045 -14.745,-5.1602 -2.8966,-5.7907 -0.99143,-12.869 4.2553,-15.81 z"
- inkscape:connector-curvature="0" />
- <path
- id="path5781"
- style="color:#000000;fill:url(#radialGradient6095)"
- d="m 611.8,183.34 c 0.72608,-5.5486 5.4119,-10.187 10.466,-10.36 5.0542,-0.17299 8.5628,4.1849 7.8367,9.7335 -0.72609,5.5486 -5.4119,10.187 -10.466,10.36 -5.0542,0.17299 -8.5628,-4.1849 -7.8367,-9.7335 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69431"
- style="color:#000000;fill:url(#radialGradient6091)"
- d="m 611.89,191.81 c 1.8428,-5.6515 7.55,-9.2936 12.747,-8.1349 5.1973,1.1587 7.9166,6.6794 6.0738,12.331 -1.8428,5.6515 -7.55,9.2936 -12.747,8.1349 -5.1973,-1.1587 -7.9166,-6.6794 -6.0738,-12.331 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69433"
- style="color:#000000;fill:url(#radialGradient6087)"
- d="m 610.34,202.65 c 2.3999,-5.711 8.6225,-8.8641 13.899,-7.0428 5.2761,1.8214 7.6078,7.9276 5.2079,13.639 -2.3999,5.711 -8.6225,8.8641 -13.899,7.0427 -5.2761,-1.8214 -7.6077,-7.9275 -5.2078,-13.639 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69435"
- style="color:#000000;fill:url(#radialGradient6083)"
- d="m 610.4,213.92 c 2.4937,-5.2879 8.4853,-7.941 13.383,-5.926 4.8974,2.015 6.846,7.9352 4.3523,13.223 -2.4937,5.2879 -8.4853,7.941 -13.383,5.926 -4.8974,-2.015 -6.846,-7.9352 -4.3523,-13.223 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69437"
- style="color:#000000;fill:url(#radialGradient6079)"
- d="m 610.41,224.46 c 2.8529,-5.3824 9.2181,-7.7743 14.217,-5.3425 4.999,2.4318 6.7388,8.7664 3.8858,14.149 -2.8529,5.3824 -9.2182,7.7743 -14.217,5.3425 -4.999,-2.4318 -6.7387,-8.7664 -3.8858,-14.149 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69439"
- style="color:#000000;fill:url(#radialGradient6075)"
- d="m 611.08,233.95 c 3.5457,-5.5333 10.608,-7.3913 15.775,-4.15 5.1667,3.2413 6.4808,10.355 2.935,15.888 -3.5457,5.5333 -10.608,7.3913 -15.775,4.15 -5.1667,-3.2413 -6.4807,-10.355 -2.935,-15.888 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69441"
- style="color:#000000;fill:url(#radialGradient6071)"
- d="m 614.16,243.21 c 3.9986,-4.6745 10.815,-5.2602 15.224,-1.3082 4.4097,3.952 4.743,10.945 0.74444,15.62 -3.9986,4.6745 -10.815,5.2601 -15.225,1.3081 -4.4097,-3.952 -4.743,-10.945 -0.74441,-15.62 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69443"
- style="color:#000000;fill:url(#radialGradient6068)"
- d="m 617.4,252.85 c 4.1738,-4.2442 10.823,-4.2432 14.851,0.002 4.0282,4.2455 3.9101,11.128 -0.26363,15.372 -4.1738,4.2442 -10.823,4.2432 -14.851,-0.002 -4.0282,-4.2455 -3.9101,-11.128 0.26366,-15.372 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69445"
- style="color:#000000;fill:url(#radialGradient6065)"
- d="m 620.56,261.75 c 4.6236,-4.345 11.727,-3.9999 15.867,0.77073 4.1395,4.7706 3.7471,12.16 -0.87648,16.505 -4.62358,4.345 -11.727,3.9999 -15.867,-0.77076 -4.1395,-4.7706 -3.747,-12.16 0.87651,-16.505 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69447"
- style="color:#000000;fill:url(#radialGradient6061)"
- d="m 625.42,270.54 c 4.8485,-3.8841 11.805,-2.874 15.537,2.2561 3.7325,5.1301 2.8278,12.438 -2.0207,16.322 -4.8485,3.8841 -11.805,2.874 -15.537,-2.2561 -3.7325,-5.1301 -2.8278,-12.438 2.0207,-16.322 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69449"
- style="color:#000000;fill:url(#radialGradient6057)"
- d="m 631.4,278.98 c 5.0343,-3.2264 11.665,-1.4 14.811,4.0795 3.1456,5.4795 1.6145,12.537 -3.4197,15.764 -5.0343,3.2264 -11.665,1.4 -14.811,-4.0796 -3.1456,-5.4795 -1.6145,-12.537 3.4198,-15.764 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69451"
- style="color:#000000;fill:url(#radialGradient6053)"
- d="m 637.59,287 c 5.3135,-2.9254 11.96,-0.53476 14.846,5.3396 2.8857,5.8744 0.91751,13.008 -4.396,15.933 -5.3135,2.9254 -11.96,0.53472 -14.846,-5.3397 -2.8856,-5.8744 -0.91748,-13.008 4.396,-15.933 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69453"
- style="color:#000000;fill:url(#radialGradient6049)"
- d="m 645.14,293.96 c 5.8513,-2.2504 12.458,1.3186 14.757,7.9715 2.2989,6.653 -0.58092,13.871 -6.4322,16.121 -5.8513,2.2504 -12.458,-1.3186 -14.757,-7.9716 -2.2989,-6.653 0.58094,-13.871 6.4322,-16.121 z"
- inkscape:connector-curvature="0" />
- <path
- id="path5785"
- style="color:#000000;fill:url(#radialGradient6045)"
- d="m 621.49,187.53 c 0.72609,-5.5486 5.4119,-10.187 10.466,-10.36 5.0542,-0.17299 8.5628,4.1849 7.8367,9.7335 -0.72609,5.5486 -5.4119,10.187 -10.466,10.36 -5.0542,0.17299 -8.5628,-4.1849 -7.8367,-9.7335 z"
- inkscape:connector-curvature="0" />
- <path
- id="path5789"
- style="color:#000000;fill:url(#radialGradient6041)"
- d="m 633.76,192.15 c 0.72608,-5.5486 5.4119,-10.187 10.466,-10.36 5.0542,-0.17299 8.5628,4.1849 7.8367,9.7335 -0.72609,5.5486 -5.4119,10.187 -10.466,10.36 -5.0542,0.17299 -8.5628,-4.1849 -7.8367,-9.7335 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69471"
- style="color:#000000;fill:url(#radialGradient6038)"
- d="m 623.3,193.65 c 1.9296,-5.6678 7.7221,-9.2405 12.938,-7.98 5.2159,1.2606 7.88,6.877 5.9504,12.545 -1.9296,5.6678 -7.7222,9.2405 -12.938,7.98 -5.2159,-1.2606 -7.88,-6.877 -5.9504,-12.545 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69473"
- style="color:#000000;fill:url(#radialGradient6035)"
- d="m 621.54,204.3 c 2.5952,-5.8524 9.0871,-8.9504 14.5,-6.9195 5.4129,2.0309 7.6971,8.4216 5.1018,14.274 -2.5952,5.8524 -9.0871,8.9504 -14.5,6.9195 -5.4129,-2.0309 -7.697,-8.4216 -5.1018,-14.274 z"
- inkscape:connector-curvature="0" />
- <path
- id="use69511"
- style="color:#000000;fill:url(#radialGradient6031)"
- d="m 634.72,193.64 c 2.8826,-5.612 9.4415,-8.1962 14.65,-5.772 5.2082,2.4242 7.0934,8.9389 4.2107,14.551 -2.8827,5.612 -9.4416,8.1962 -14.65,5.7719 -5.2082,-2.4242 -7.0933,-8.9389 -4.2107,-14.551 z"
- inkscape:connector-curvature="0" />
- </g>
- <path
- id="path20422"
- style="color:#000000;fill:url(#linearGradient4802)"
- d="m 439.4822,8.6356917 c 11.558,20.3120003 22.438,41.3290003 27.882,64.2130003 4.3668,16.366 7.2441,33.086998 9.5864,49.849998 2.3131,-12.527 -1.5371,-25.189998 -4.287,-37.362998 -5.1707,-18.863 -10.925,-37.803 -20.057,-55.168 -4.1955,-7.2849 -8.6736,-14.401 -13.125,-21.5310003 z m -6.9688,7.0625003 c 10.525,20.309 21.771,40.604 26.947,63.092 3.8277,14.166 6.6565,28.578998 9.1468,43.032998 2.1885,-13.032 -2.243,-26.082998 -5.4059,-38.597998 -5.9866,-20.219 -13.316,-40.267 -24.91,-58.016 -1.9026,-3.1844 -3.8303,-6.3538 -5.7779,-9.5108 z m -7.0312,7.25 c 18.095,30.019 27.755,64.201 34.812,98.280998 -2.933,-31.505998 -13.178,-62.128998 -29.365,-89.283998 -1.7633,-3.0305 -3.5817,-6.0289 -5.4478,-8.9972 z m -8.5625,3.125 c 18.032,28.82 27.444,61.94 34.938,94.811998 1.4171,-14.322 -4.1922,-28.165998 -8.7777,-41.480998 -7.19,-18.43 -15.21,-36.8 -26.16,-53.331 z m -6.4375,7.1562 c 16.085,27.044 25.271,57.447 33,87.749998 0.59736,-15.848 -5.8979,-30.893998 -11.454,-45.424998 -6.17,-14.57 -12.87,-29.06 -21.55,-42.325 z m -6.4688,7.8438 c 14.516,24.945 23.241,52.678 31.031,80.311998 -0.41899,-17.065 -7.7566,-33.021998 -14.225,-48.518998 -4.9799,-10.899 -10.212,-21.763 -16.806,-31.793 z m -6.59,7.84 c 13.224,22.885 21.444,48.169 29.281,73.280998 -1.1113,-17.506 -8.941,-33.714998 -16.1,-49.443998 -3.99,-8.15 -8.18,-16.25 -13.18,-23.84 z m -6.75,8.0625 c 12.063,20.8 19.918,43.648998 27.562,66.343998 2.2489,-7.2802 -2.9892,-14.894 -5.1809,-21.817 -6.64,-15.219998 -14.03,-30.159998 -22.38,-44.529998 z m -6.7812,8.2812 c 11.116,18.658 18.525,39.175998 25.938,59.499998 1.8246,-7.1417 -3.3197,-14.332 -5.6263,-20.994 -6.0992,-13.166998 -12.782,-26.098998 -20.311,-38.505998 z m -6.8438,8.3125 c 10.208,16.606 17.291,34.849998 24.375,52.937998 1.4327,-7.0101 -3.556,-13.759 -6.0067,-20.145 -5.5534,-11.229998 -11.614,-22.238998 -18.368,-32.792998 z m -6.9062,8.4062 c 9.3471,14.608 16.083,30.656998 22.781,46.593998 1.1529,-7.0458 -3.9792,-13.519 -6.6612,-19.778 -4.9386,-9.185698 -10.267,-18.181998 -16.12,-26.815998 z m -7.0625,8.5625 c 8.5564,12.624998 15.039,26.484998 21.375,40.311998 0.72445,-7.2453 -4.7193,-13.568 -7.8292,-19.811 -4.221,-7.0192 -8.6798,-13.910998 -13.546,-20.501998 z m -6.9688,8.75 c 7.7583,10.637998 13.809,22.380998 19.688,34.124998 -0.24127,-9.2646 -7.8434,-16.715 -12.393,-24.404 -2.3545,-3.2963 -4.7344,-6.58 -7.2947,-9.720798 z m -7.0312,8.781198 c 6.9352,8.7585 12.494,18.49 17.875,28.25 -0.53583,-8.2604 -7.4416,-14.592 -11.929,-21.167 -1.9252,-2.4076 -3.879,-4.7953 -5.9459,-7.0834 z m -7.125,8.9062 c 2.7748,2.8735 2.8092,2.7157 0,0 z m 2.4375,2.5 c 4.216,5.0185 11.453,18.825 14.251,18.122 -4.3458,-6.3421 -8.9605,-12.53 -14.251,-18.122 z m -9.48,6.69 c 2.1539,1.9504 2.1754,1.8275 0,0 z m 1.625,1.4375 c 3.7454,3.7619 10.2,14.801 12.653,13.732 -3.8941,-4.86 -8.0281,-9.5508 -12.653,-13.732 z m -8.62,7.75 1.38,1.09 -1.38,-1.09 z m 1.5,1.1875 c 2.1403,1.9825 9.4816,11.353 8.5275,7.6885 -2.6958,-2.7192 -5.5263,-5.3088 -8.5275,-7.6885 z m -8.4688,8.125 c 2.367,2.6177 10.822,8.4711 3.7216,2.6095 -1.2138,-0.90698 -2.4491,-1.7863 -3.7216,-2.6095 z m -7.03,9.59 c 0.83827,0.91872 3.482,2.0407 1.0401,0.56061 l -1.04,-0.56 z"
- inkscape:connector-curvature="0" />
- <path
- id="path5492"
- style="color:#000000;fill:url(#radialGradient5997)"
- d="m 457.8122,115.26469 c -52.992,0.38056 -102.9,20.805 -151.75,39.205 -11.4,6.2687 -20.696,7.9369 -38.955,13.351 l 4.2233,67.886 c 51.935,32.713 110.7,54.264 170.95,65.656 56.904,10.662 117.2,2.8334 172.14,-14.471 -12.626,-5.8038 -28.883,-11.982 -37.621,-24.546 -13.516,-16.622 -13.532,-40.769 -2.742,-58.776 11.243,-20.976 47.014,-51.312 47.014,-51.312 -49.911,-23.48 -111.11,-36.278 -158.11,-36.962 -1.7159,-0.0302 -3.4279,-0.0438 -5.1373,-0.0314 z"
- inkscape:connector-curvature="0" />
- <path
- id="path22024"
- d="m 241.66,105.22 c 0.0116,0.25671 0.003,0.47396 0,0.71875 0.0322,-0.15906 0.0693,-0.33382 0.0937,-0.5 -0.0221,-0.0814 -0.0704,-0.13698 -0.0937,-0.21875 z m -17.531,4.2188 c 1.2126,1.6584 2.6517,3.1727 4.3125,4.5312 4.2081,2.4246 8.1115,3.352 10.781,1.9688 0.46014,-0.23835 0.96121,-0.5324 1.3438,-0.90625 0.38254,-0.37385 0.67603,-0.81697 0.96875,-1.3438 0.31519,-0.62153 0.52844,-1.299 0.65625,-2.0938 -0.0961,0.27982 -0.21699,0.50005 -0.34375,0.75 -0.29272,0.52678 -0.58621,0.93865 -0.96875,1.3125 -0.38254,0.37385 -0.88363,0.69912 -1.3438,0.9375 -3.6378,1.8848 -9.5368,-0.50863 -15.406,-5.1562 z"
- transform="matrix(1.6155,0,0,1.8664,225.1722,64.854692)"
- inkscape:connector-curvature="0"
- style="opacity:0.65517004;fill:url(#linearGradient22037);fill-rule:evenodd;filter:url(#filter5215)" />
- <path
- id="path21977"
- style="color:#000000;fill:url(#radialGradient4738)"
- d="m 616.4222,150.41469 c -21.33,15.59 -39.95,35.94 -50.44,60.41 -7.15,15.91 -5.37,35.24 4.75,49.47 8.91,13.06 22.64,22.32 37.44,27.5 5.04,1.84 13.59,-2.72 19.66,-4.38 23.08,-8.83 45.98,-20.38 63.15,-38.56 6.99,-8.47 16.11,-17.98 14.32,-29.94 -2.76,-13.28 -13.96,-22.42 -24.1,-30.4 -19.55,-14.27 -41.31,-25.48 -64,-33.85 l -0.78,-0.25 z"
- inkscape:connector-curvature="0" />
- <path
- id="path4843"
- style="opacity:0.59052004;color:#000000;fill:url(#linearGradient5709);filter:url(#filter5635)"
- d="m 575.3522,209.51469 c 0,0 -16.801,29.429 20.25,58.375 6.3175,4.9355 14.057,-0.67233 15.844,-14.969 5.3004,-42.401 -36.094,-43.406 -36.094,-43.406 z"
- inkscape:connector-curvature="0" />
- <path
- id="path4169"
- style="color:#000000;fill:url(#radialGradient5763);filter:url(#filter5656)"
- d="m 648.75,181.88 c -20.458,18.987 -41.654,38.581 -48.719,68.344 -5.8119,21.792 5.1829,44.317 21.406,56.531 7.4919,4.7234 14.227,13.171 22.219,17.094 1.0593,-0.32563 2.1085,-0.66703 3.1562,-1 -4.9057,-4.1113 -9.5894,-8.8137 -14.594,-11.969 -5.7202,-4.3065 -10.836,-9.8179 -14.906,-16.094 -0.0663,-0.0857 -0.15296,-0.16385 -0.21875,-0.25 -9.5358,-12.484 -14.517,-29.112 -10.188,-45.344 6.7307,-28.354 26.287,-47.493 45.812,-65.656 -1.314,-0.55313 -2.6369,-1.1113 -3.9688,-1.6562 z"
- transform="matrix(1.0283,0,0,0.91288,-54.654198,-12.202308)"
- inkscape:connector-curvature="0" />
- <path
- id="path5721"
- d="m 633.57,211.67 c -1.9749,-0.43614 -5.4408,3.9539 -5.7223,5.0666 4.4203,-5.0701 10.04,-0.94108 13.009,6.6186 5.7693,14.059 7.9406,32.349 9.3535,49.898 0.43203,8.0843 1.0967,16.069 1.7928,24.078 0.61818,9.0085 0.87375,18.173 0.35703,27.228 1.7303,-28.123 0.91112,-57.377 -3.9515,-84.18 -2.1745,-10.883 -5.1526,-22.822 -10.913,-27.564 -1.2514,-0.89043 -2.5972,-1.3107 -3.9256,-1.1446 z"
- transform="matrix(1.0701,0,0,0.49899,-82.062798,70.714692)"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient5723);fill-rule:evenodd;filter:url(#filter5751)" />
- <path
- id="path4236"
- style="color:#000000;fill:url(#linearGradient4248);filter:url(#filter5199)"
- d="m 693.72,230.06 c -10.36,0 -18.781,8.4209 -18.781,18.781 0,10.3601 8.4209,18.75 18.781,18.75 10.3601,0 18.75,-8.3896 18.75,-18.75 0,-10.3604 -8.3896,-18.781 -18.75,-18.781 z"
- transform="matrix(0.81066,0,0,0.78682,89.172202,22.801692)"
- inkscape:connector-curvature="0" />
- <path
- id="path21735"
- d="m 694.93,235.95 c -0.56203,0.0182 -1.1234,0.0435 -1.7159,0.14253 -2.2029,0.41121 -4.3181,1.5048 -5.8237,2.993 4.862,-2.7995 11.342,-1.8854 15.079,2.2804 2.4048,2.6804 4.6707,6.5605 3.8478,9.6918 2.0336,-6.7147 -2.2555,-14.319 -9.7235,-15.06 -0.53343,-0.0529 -1.1019,-0.0656 -1.6639,-0.0475 z m 11.387,15.108 c -0.25087,-0.0802 -0.49629,-0.0991 0,0.095 0.28081,0.0752 0.447,0.11369 0.41599,0.095 -0.0315,-0.0182 -0.22693,-0.0975 -0.36399,-0.14253 -0.0208,-0.006 -0.0318,-0.0416 -0.0519,-0.0475 z"
- transform="matrix(1.3016,0,0,1.1406,-250.9178,-65.996208)"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient21961);fill-rule:evenodd;filter:url(#filter5805)" />
- <path
- id="path5737"
- d="m 639.84,244.12 c -3.3225,0.19528 -7.5532,2.5668 -7.875,3.1562 5.6586,-2.621 13.008,-0.21742 16.188,3.625 7.0554,8.0203 8.7853,17.677 10.25,26.906 1.3398,9.1045 1.0115,18.276 0.875,27.406 0.43513,8.6634 0.18437,17.373 -1.5,25.969 4.8898,-20.307 6.6108,-41.179 2.8125,-61.656 -1.79,-7.63 -3.71,-15.79 -10.59,-22.03 -2.1872,-1.838 -5.3381,-3.2957 -8.8125,-3.3125 -0.42381,-0.0724 -0.86911,-0.0904 -1.3438,-0.0625 z"
- transform="matrix(1,0,0,0.98155,-46.577798,-58.454308)"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient7795);fill-rule:evenodd;filter:url(#filter5743)" />
- <path
- id="path4189"
- style="color:#000000;fill:url(#radialGradient4285)"
- d="m 654.5522,204.46469 c -6.9069,0 -12.531,5.5618 -12.531,12.469 0,6.9069 5.6244,12.5 12.531,12.5 6.9069,0 12.5,-5.5931 12.5,-12.5 0,-6.9069 -5.5931,-12.469 -12.5,-12.469 z"
- inkscape:connector-curvature="0" />
- <path
- id="path4290"
- d="m 625.8422,166.42469 c 0.0353,-0.15254 -0.16455,0.19614 -0.72866,1.2005 -16.118,23.664 -15.227,49.386 10.618,67.126 7.0844,3.368 15.185,4.6917 23.005,3.7014 -33.1,-5.8168 -45.946,-49.03 -33.623,-70.627 0.40542,-0.67555 0.69492,-1.248 0.72866,-1.4005 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient21752);fill-rule:evenodd;filter:url(#filter5533)" />
- <path
- id="path6631"
- style="opacity:0.68102997;color:#000000;fill:url(#linearGradient4748);filter:url(#filter5483)"
- d="m 287.2322,208.85469 c 104.83,-28.98 199.78,-46.32 293.57,-4.34 -57.43,-54.65 -201.81,-41.73 -293.57,4.34 z"
- inkscape:connector-curvature="0" />
- <path
- id="path4193"
- d="m 244.59,82.125 c 0.007,0.0213 0.0488,0.11234 0.0937,0.1875 0.007,0.01105 -0.007,0.02043 0,0.03125 0.0832,0.13632 0.18095,0.25656 0.0312,-0.03125 -0.0991,-0.1453 -0.13165,-0.2088 -0.125,-0.1875 z m 0.0937,0.21875 c -4.2802,3.0182 -5.1927,9.8194 -0.125,12.625 1.1954,0.63015 2.6171,0.87091 3.9375,0.6875 -3.4272,-0.42835 -6.0625,-3.3318 -6.0625,-6.875 0,-2.2797 0.56176,-5.1581 2.25,-6.4375 z"
- transform="matrix(3.2217,0,0,2.6903,-144.8878,-23.716308)"
- inkscape:connector-curvature="0"
- style="fill:#0023d5;fill-rule:evenodd;filter:url(#filter5195)" />
- <path
- id="path4191"
- style="color:#000000;fill:url(#radialGradient4351)"
- d="m 654.8822,210.32469 c -3.5744,0 -6.4688,2.8944 -6.4688,6.4688 0,3.5744 2.8944,6.4688 6.4688,6.4688 3.5744,0 6.4688,-2.8944 6.4688,-6.4688 0,-3.5744 -2.8944,-6.4688 -6.4688,-6.4688 z"
- inkscape:connector-curvature="0" />
- <path
- id="path5412"
- d="m 688.2222,234.98469 c -9.5469,-0.0927 -16.125,9.6562 -16.125,9.6562 0,0 4.4868,-2.1916 6.9375,-2.7188 5.2062,-1.5378 10.708,-2.4244 16.156,-2.4062 0.92023,-1.6731 1.9006,-2.5784 0.28125,-3.5 -1.9866,-0.8007 -4.1426,-1.0815 -6.2812,-1 -0.31402,-0.0241 -0.66078,-0.0283 -0.96875,-0.0312 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient5945);fill-rule:evenodd;filter:url(#filter5429)" />
- <path
- id="path21824"
- d="m 682.0422,240.29469 c -3.38,0.05 -6.81,1.05 -9.46,3.22 -2.33,1.82 -4.2,4.14 -5.91,6.53 6.68,-4.98 14.75,-8.15 23.09,-8.66 1.1,-0.07 2.21,-0.1 3.32,-0.09 -3.66,-0.53 -7.33,-1.07 -11.04,-1 z"
- inkscape:connector-curvature="0"
- style="fill:url(#radialGradient4730);fill-rule:evenodd;filter:url(#filter5391)" />
- <path
- id="path13033"
- style="color:#000000;fill:url(#linearGradient3948)"
- d="m 107.4122,173.01469 c -20.789998,3.859 -61.466998,14.771 -61.466998,14.771 0,0 126.489998,-34.366 189.849998,-20.565 63.36,13.801 -41.212,-4.2855 -95.052,9.4395 -29.165,7.4348 -58.657998,14.115 -87.061998,24.048 4.7638,-0.54943 19.793,-6.0861 28.603,-8.244 43.351998,-12.17 87.716998,-22.232 132.859998,-24.082 4.8646,-0.19943 26.214,2.9018 11.105,2.7934 -29.12,2.501 -57.081,11.898 -85.061,19.791 -9.22,2.6011 -50.455998,15.84 -54.097998,17.241 32.866998,-7.8354 88.248998,-26.117 121.549998,-31.968 4.1961,-0.73721 20.165,-2.4092 16.597,-0.23434 -25.143,4.2322 -48.876,14.113 -72.965,22.134 -13.038,4.3413 -25.991,8.932 -38.97,13.446 32.233,-7.7816 63.483,-18.925 94.928,-29.263 5.2015,-1.7101 25.693,-2.1213 10.665,0.88789 -24.077,7.7881 -46.921,18.913 -70.61,27.78 -6.9069,2.8931 -21.657,8.2534 -23.601,9.461 30.355,-7.4121 59.161,-19.656 87.846,-31.723 4.0352,-1.6975 23.461,-3.0177 10.235,-0.0151 -22.289,8.0784 -42.342,21.149 -64.24,30.194 -8.621,3.8976 -17.311,7.644 -26.081,11.195 27.621,-6.7844 53.293,-19.25 78.282,-32.459 5.1055,-2.6986 21.474,-7.24 20.727,-4.4917 -24.61,8.1832 -44.576,25.687 -68.119,36.186 -5.2071,2.814 -20.017,8.6915 -19.826,9.0712 25.161,-6.2614 47.478,-19.759 69.416,-33.058 8.5648,-5.5821 28.372,-8.7317 28.372,-8.7317 0,0 -6.3506,3.2302 -10.88,4.9533 -21.462,8.3996 -37.478,26.071 -58.179,35.97 -6.0169,3.6199 -19.324,8.8951 -21.435,10.004 23.495,-5.4984 43.661,-19.312 62.877,-33.28 9.2008,-6.0578 32.565,-12.608 32.565,-12.608 0,0 -27.307,13.771 -38.489,24.296 -14.692,13.041 -31.222,24.288 -49.942,30.65 20.767,-4.612 38.448,-17.054 54.234,-30.772 11.3,-9.8257 25.731,-15.157 38.634,-22.546 -12.104,8.564 -24.894,16.156 -35.649,26.381 -16.944,15.017 -33.168,31.123 -46.904,49.174 22.053,-23.924 46.591,-47.62 74.619,-64.634 -7.0973,8.4203 -17.148,14.572 -24.998,22.61 -16.667,17.064 -32.41,35.108 -46.74,54.187 16.84,-17.668 32.508,-36.541 50.439,-53.117 8.942,-7.8852 27.988,-22.218 27.988,-22.218 -25.82,24.572 -49.054,53.47 -68.717,77.671 -3.4412,4.5568 -11.74,15.567 -2.9454,5.1707 19.953,-21.076 37.384,-45.379 59.318,-64.771 4.3998,-3.8899 15.104,-11.735 14.353,-10.217 -14.257,16.772 -32.172,30.414 -44.491,48.865 -10.929,15.34 -22.349,30.325 -33.156,45.755 17.194,-18.728 31.456,-39.839 47.703,-59.325 9.4186,-10.32 20.405,-20.274 30.528,-29.868 -13.944,19.765 -33.19,36.455 -45.79,57.26 -10.274,15.696 -21.337,30.854 -31.884,46.365 18.374,-20.885 32.55,-44.972 50.085,-66.477 9.122,-10.399 19.426,-21.084 28.713,-31.33 -12.977,21.602 -32.547,39.749 -45.022,61.731 -10.659,17.396 -22.16,34.249 -33.59,51.143 22.428,-27.245 38.129,-59.437 62.262,-85.337 7.0547,-7.6065 13.212,-19.962 20.26,-27.554 -8.9432,18.531 -24.462,37.362 -34.334,55.573 -10.102,16.991 -22.907,32.118 -32.807,49.234 -2.8173,4.5154 -11.863,17.691 -10.79,16.477 12.541,-17.049 23.321,-35.331 37.099,-51.468 10.906,-15.463 31.46,-47.196 31.46,-47.196 l 18.311,-25.001 c 0,0 9.7299,7.8856 10.267,2.9201 1.8324,-11.836 22.799,-75.394 -7.1504,-67.82 -54.517,-10.349 -115.94,-3.0391 -161.7,5.5428 z"
- inkscape:connector-curvature="0" />
- <metadata
- id="metadata962">
- <rdf:RDF>
- <cc:Work>
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:publisher>
- <cc:Agent
- rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:title>not gold fish, ne auksinė žuvelė</dc:title>
- <dc:date>2013-07-18T19:19:44</dc:date>
- <dc:description>not gold fish, ne auksinė žuvelė</dc:description>
- <dc:source>http://openclipart.org/detail/180975/not-gold-fish-ne-auksinė-žuvelė-by-keistutis-180975</dc:source>
- <dc:creator>
- <cc:Agent>
- <dc:title>Keistutis</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>ne auksinė žuvelė</rdf:li>
- <rdf:li>not gold fish</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/src/activities/reversecount/resource/drunken_duck_cartoon_globefish_kugelfisch.svg b/src/activities/reversecount/resource/drunken_duck_cartoon_globefish_kugelfisch.svg
deleted file mode 100644
index e964f330c..000000000
--- a/src/activities/reversecount/resource/drunken_duck_cartoon_globefish_kugelfisch.svg
+++ /dev/null
@@ -1,771 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- viewBox="0 0 540.83 444.03"
- version="1.0"
- inkscape:version="0.91 r13725"
- sodipodi:docname="drunken_duck_cartoon_globefish_kugelfisch.svg">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview141" />
- <defs
- id="defs4">
- <linearGradient
- id="linearGradient9918">
- <stop
- id="stop9920"
- offset="0" />
- <stop
- id="stop9922"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <radialGradient
- id="radialGradient2876"
- gradientUnits="userSpaceOnUse"
- cy="500.93"
- cx="768.57"
- gradientTransform="matrix(1 0 0 .94789 0 26.103)"
- r="603.12">
- <stop
- id="stop2872"
- stop-color="#edbd00"
- offset="0" />
- <stop
- id="stop2874"
- stop-color="#edbd00"
- stop-opacity="0"
- offset="1" />
- </radialGradient>
- <linearGradient
- id="linearGradient2900"
- y2="474.84"
- gradientUnits="userSpaceOnUse"
- x2="28.446"
- gradientTransform="translate(-8)"
- y1="434.84"
- x1="-197.14">
- <stop
- id="stop2888"
- stop-color="#ed7300"
- offset="0" />
- <stop
- id="stop2890"
- stop-color="#ed7300"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient9950"
- y2="1410.2"
- xlink:href="#linearGradient9918"
- gradientUnits="userSpaceOnUse"
- x2="355.04"
- gradientTransform="matrix(.67393 .73879 -.73879 .67393 646.52 351.01)"
- y1="1548.1"
- x1="242.83" />
- <linearGradient
- id="linearGradient9952"
- y2="1410.2"
- xlink:href="#linearGradient9918"
- gradientUnits="userSpaceOnUse"
- x2="355.04"
- gradientTransform="matrix(.73342 .67978 -.67978 .73342 703.41 241.14)"
- y1="1548.1"
- x1="242.83" />
- <linearGradient
- id="linearGradient9954"
- y2="1410.2"
- xlink:href="#linearGradient9918"
- gradientUnits="userSpaceOnUse"
- x2="355.04"
- gradientTransform="matrix(.82138 .57038 -.57038 .82138 678.23 104.93)"
- y1="1548.1"
- x1="242.83" />
- </defs>
- <g
- id="layer1"
- transform="translate(-18.94 -17.213)">
- <g
- id="g2418"
- transform="matrix(.36006 0 0 .36006 109.95 78.117)">
- <g
- id="g2420"
- fill-rule="evenodd"
- transform="matrix(.99395 .10982 -.10982 .99395 94.907 -8.2982)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2422"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2424"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2426"
- fill-rule="evenodd"
- transform="matrix(.21782 -.97599 .97599 .21782 -514.94 173.86)">
- <path
- id="path2428"
- d="m-241.56 1378.1s-80.97 343.8-76.86 450.2c4.12 106.3 46.67-12.4 93.33-24.7 46.67-12.4 41.91-37.1 88.58-49.4 46.663-12.4 51.416 12.3 98.08 0 46.665-12.4 39.992-34.9 86.657-47.3 46.665-12.3 53.333 10.2 100-2.1 46.66-12.4 39.06-37.1 85.72-49.5 46.67-12.3 54.27 12.4 100.94 0 46.66-12.3 160.58 61.1 93.33-24.7-67.26-85.7-362.34-318.4-362.34-318.4"
- stroke="#000"
- stroke-width="6.4"
- fill="#ff9d00" />
- <path
- id="path2430"
- opacity=".4"
- d="m-142.76 1357.3l-70.96 14.9s8.82 322.9 12.55 421.6c10.52-4.8 31.07-28.6 58.63-38.4s56.677-4.7 79.868 2"
- fill="url(#linearGradient9950)" />
- <path
- id="path2432"
- opacity=".4"
- d="m-6.596 1328l-62.925 13.2s36.792 308.6 48.772 406.7c10.087-5.7 38.512-24.1 58.124-38.3 19.453-14.2 53.177-6.3 76.845-1.6"
- fill="url(#linearGradient9952)" />
- <path
- id="path2434"
- opacity=".4"
- d="m112.76 1349l-46.632-36.4s80.982 292.1 106.57 387.5c11.25-4.4 28.84-19.3 54.81-29.1 26.35-10 48.04-38.5 72.12-37.2"
- fill="url(#linearGradient9954)" />
- </g>
- <g
- id="g2436"
- fill-rule="evenodd"
- transform="matrix(.72107 -.69287 .69287 .72107 -217.52 452.56)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2438"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2440"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2442"
- fill-rule="evenodd"
- transform="matrix(.90924 -.41628 .41628 .90924 -254 254.79)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2444"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2446"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2448"
- fill-rule="evenodd"
- transform="matrix(.53538 -.84461 .84461 .53538 -285.59 647.19)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2450"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2452"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2454"
- fill-rule="evenodd"
- transform="matrix(.40247 -.91543 .91543 .40247 -265.61 777.27)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2456"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2458"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2460"
- fill-rule="evenodd"
- transform="matrix(-.032030 -.99949 .99949 -.032030 -73.43 1048.8)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2462"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2464"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2466"
- fill-rule="evenodd"
- transform="matrix(-.094941 -.99548 .99548 -.094941 -38.767 940.03)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2468"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2470"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2472"
- fill-rule="evenodd"
- transform="matrix(-.70369 -.71050 .71050 -.70369 358.09 1036.9)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2474"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2476"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2478"
- fill-rule="evenodd"
- transform="matrix(-.41434 -.91012 .91012 -.41434 181.03 1117.5)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2480"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2482"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2484"
- fill-rule="evenodd"
- transform="translate(-137.19 -6.7678)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2486"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2488"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2490"
- fill-rule="evenodd"
- transform="matrix(.81953 .57303 -.57303 .81953 417.45 -62.802)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2492"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2494"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2496"
- fill-rule="evenodd"
- transform="matrix(.79384 .60813 -.60813 .79384 478.79 111.32)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2498"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2500"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2502"
- fill-rule="evenodd"
- transform="matrix(.26539 .96414 -.96414 .26539 736.68 122.06)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2504"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2506"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2508"
- fill-rule="evenodd"
- transform="matrix(-.35728 .934 -.934 -.35728 985.63 276.13)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2510"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2512"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2514"
- fill-rule="evenodd"
- transform="translate(-226.88 -35.033)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2516"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2518"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2520"
- fill-rule="evenodd"
- transform="matrix(-.86006 -.51019 .51019 -.86006 453.29 954.14)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2522"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2524"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2526"
- fill-rule="evenodd"
- transform="matrix(.72107 -.69287 .69287 .72107 -319.72 478.96)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2528"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2530"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2532"
- fill-rule="evenodd"
- transform="matrix(.20607 -.97854 .97854 .20607 -199.82 876.11)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2534"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2536"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2538"
- fill-rule="evenodd"
- transform="matrix(-.12794 -.99178 .99178 -.12794 -29.743 1128.3)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2540"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2542"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <path
- id="path2544"
- stroke-linejoin="round"
- d="m1060 500.93a600 568.57 0 1 1 -1200 0 600 568.57 0 1 1 1200 0z"
- transform="translate(-37.143 -8.5714)"
- stroke="#000"
- stroke-linecap="round"
- stroke-width="6.25"
- fill="#ed8400" />
- <path
- id="path2546"
- d="m426.29-70.487c-331.2 0-600 254.71-600 568.57 0 178.52 87.039 337.83 223 442.09-87.412-98.78-140.16-226.04-140.16-364.94-0.001-313.85 268.8-568.59 600-568.59 142.81-0.0016 273.97 47.456 377.03 126.5-110.09-124.42-275.25-203.63-459.87-203.63z"
- fill="url(#linearGradient2900)" />
- <path
- id="path2548"
- d="m1060 500.93a600 568.57 0 1 1 -1200 0 600 568.57 0 1 1 1200 0z"
- fill="url(#radialGradient2876)"
- transform="translate(-42.286 -14.571)" />
- <g
- id="g2550"
- stroke-linejoin="round"
- stroke-linecap="round">
- <path
- id="path2552"
- opacity=".7"
- d="m568.57 496.65a148.57 138.57 0 1 1 -297.14 0 148.57 138.57 0 1 1 297.14 0z"
- transform="matrix(.92612 0 0 .99301 -178.4 -290.24)"
- stroke="#868686"
- stroke-width="27.261"
- fill="#fff" />
- <path
- id="path2554"
- opacity=".7"
- d="m568.57 496.65a148.57 138.57 0 1 1 -297.14 0 148.57 138.57 0 1 1 297.14 0z"
- stroke-opacity=".18333"
- transform="matrix(.92612 0 0 .99301 -177.26 -289.81)"
- stroke="#3c34ff"
- stroke-width="5"
- fill="#fff" />
- <path
- id="path2556"
- opacity=".7"
- d="m206.99 91.326c-58.06 0-105.18 47.124-105.18 105.18 0 42 24.71 78.15 60.32 95.01-18.37-18.94-29.74-44.72-29.74-73.17 0-58.07 47.12-105.19 105.18-105.19 16.07 0 31.25 3.71 44.87 10.15-19.12-19.7-45.84-31.984-75.45-31.984z"
- stroke-opacity=".18333"
- stroke="#3c34ff"
- stroke-width="3.8223"
- fill="#868686" />
- <path
- id="path2558"
- d="m568.57 496.65a148.57 138.57 0 1 1 -297.14 0 148.57 138.57 0 1 1 297.14 0z"
- stroke-opacity=".18333"
- transform="matrix(.189 0 0 .20265 126.34 103.14)"
- stroke="#3c34ff"
- stroke-width="5" />
- </g>
- <g
- id="g2560"
- stroke-linejoin="round"
- stroke-linecap="round"
- transform="translate(180.86 .85714)">
- <path
- id="path2562"
- opacity=".7"
- d="m568.57 496.65a148.57 138.57 0 1 1 -297.14 0 148.57 138.57 0 1 1 297.14 0z"
- transform="matrix(.92612 0 0 .99301 -178.4 -290.24)"
- stroke="#868686"
- stroke-width="27.261"
- fill="#fff" />
- <path
- id="path2564"
- opacity=".7"
- d="m568.57 496.65a148.57 138.57 0 1 1 -297.14 0 148.57 138.57 0 1 1 297.14 0z"
- stroke-opacity=".18333"
- transform="matrix(.92612 0 0 .99301 -177.26 -289.81)"
- stroke="#3c34ff"
- stroke-width="5"
- fill="#fff" />
- <path
- id="path2566"
- opacity=".7"
- d="m206.99 91.326c-58.06 0-105.18 47.124-105.18 105.18 0 42 24.71 78.15 60.32 95.01-18.37-18.94-29.74-44.72-29.74-73.17 0-58.07 47.12-105.19 105.18-105.19 16.07 0 31.25 3.71 44.87 10.15-19.12-19.7-45.84-31.984-75.45-31.984z"
- stroke-opacity=".18333"
- stroke="#3c34ff"
- stroke-width="3.8223"
- fill="#868686" />
- <path
- id="path2568"
- d="m568.57 496.65a148.57 138.57 0 1 1 -297.14 0 148.57 138.57 0 1 1 297.14 0z"
- stroke-opacity=".18333"
- transform="matrix(.189 0 0 .20265 126.34 103.14)"
- stroke="#3c34ff"
- stroke-width="5" />
- </g>
- <path
- id="path2570"
- stroke-linejoin="round"
- d="m185.71 563.79a30 31.429 0 1 1 -60 0 30 31.429 0 1 1 60 0z"
- stroke="#000"
- stroke-linecap="round"
- stroke-width="6.25"
- fill="#ed8400" />
- <g
- id="g2572"
- fill-rule="evenodd"
- transform="matrix(.96609 .25820 -.25820 .96609 17.458 -163.86)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2574"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2576"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2578"
- stroke-linejoin="round"
- transform="translate(-1325.7 -100)"
- stroke="#000"
- stroke-linecap="round"
- stroke-width="6.25">
- <path
- id="path2580"
- d="m185.71 563.79a30 31.429 0 1 1 -60 0 30 31.429 0 1 1 60 0z"
- fill="#c20000"
- transform="matrix(1.3721 0 0 1.3721 1270.1 -111.21)" />
- <path
- id="path2582"
- d="m185.71 563.79a30 31.429 0 1 1 -60 0 30 31.429 0 1 1 60 0z"
- fill="#ed8400"
- transform="matrix(.79328 0 0 .79328 1360.2 215.12)" />
- </g>
- <g
- id="g2584"
- fill-rule="evenodd"
- transform="matrix(.87271 .48824 -.48824 .87271 358.73 -107.6)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2586"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2588"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2590"
- fill-rule="evenodd"
- transform="matrix(.907 .42112 -.42112 .907 216.51 -139.01)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2592"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2594"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2596"
- fill-rule="evenodd"
- transform="matrix(.81953 .57303 -.57303 .81953 251.7 -11.423)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2598"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2600"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2602"
- fill-rule="evenodd"
- transform="matrix(.79384 .60813 -.60813 .79384 296.49 175.04)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2604"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2606"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2608"
- fill-rule="evenodd"
- transform="matrix(.026267 -.60334 .31086 .013534 263.09 489.79)">
- <path
- id="path2610"
- d="m-241.56 1378.1s-80.97 343.8-76.86 450.2c4.12 106.3 46.67-12.4 93.33-24.7 46.67-12.4 41.91-37.1 88.58-49.4 46.663-12.4 51.416 12.3 98.08 0 46.665-12.4 39.992-34.9 86.657-47.3 46.665-12.3 53.333 10.2 100-2.1 46.66-12.4 39.06-37.1 85.72-49.5 46.67-12.3 54.27 12.4 100.94 0 46.66-12.3 160.58 61.1 93.33-24.7-67.26-85.7-362.34-318.4-362.34-318.4"
- stroke="#000"
- stroke-width="6.4"
- fill="#ff9d00" />
- <path
- id="path2612"
- opacity=".4"
- d="m-142.76 1357.3l-70.96 14.9s8.82 322.9 12.55 421.6c10.52-4.8 31.07-28.6 58.63-38.4s56.677-4.7 79.868 2"
- fill="url(#linearGradient9950)" />
- <path
- id="path2614"
- opacity=".4"
- d="m-6.596 1328l-62.925 13.2s36.792 308.6 48.772 406.7c10.087-5.7 38.512-24.1 58.124-38.3 19.453-14.2 53.177-6.3 76.845-1.6"
- fill="url(#linearGradient9952)" />
- <path
- id="path2616"
- opacity=".4"
- d="m112.76 1349l-46.632-36.4s80.982 292.1 106.57 387.5c11.25-4.4 28.84-19.3 54.81-29.1 26.35-10 48.04-38.5 72.12-37.2"
- fill="url(#linearGradient9954)" />
- </g>
- <g
- id="g2618"
- fill-rule="evenodd"
- transform="matrix(.59101 .80667 -.80667 .59101 596.27 85.063)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2620"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2622"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2624"
- transform="translate(327.41 364.97)">
- <g
- id="g2626"
- fill-rule="evenodd"
- transform="matrix(.70651 .70770 -.70770 .70651 185.64 -428.55)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2628"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2630"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- </g>
- <g
- id="g2632"
- fill-rule="evenodd"
- transform="matrix(-.15954 .98719 -.98719 -.15954 829.93 310.33)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2634"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2636"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2638"
- fill-rule="evenodd"
- transform="matrix(.045644 .99896 -.99896 .045644 843.65 231.45)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2640"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2642"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2644"
- fill-rule="evenodd"
- transform="matrix(.26539 .96414 -.96414 .26539 622.91 159.92)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2646"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2648"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2650"
- fill-rule="evenodd"
- transform="matrix(.25145 -.59629 .59629 .25145 -236.79 586.75)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2652"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2654"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- <g
- id="g2656"
- fill-rule="evenodd"
- transform="matrix(.50205 -.40832 .40832 .50205 -32.308 208.34)"
- stroke="#000"
- stroke-width="3.6157"
- fill="#ed8400">
- <path
- id="path2658"
- d="m703.42-132.31l-141.65 128.88 32.69 86.151 70.32 18.659 38.64-233.69z" />
- <path
- id="path2660"
- d="m595.68 83.645l106.82-214.74" />
- </g>
- </g>
- </g>
- <metadata
- id="metadata139">
- <rdf:RDF>
- <cc:Work>
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:publisher>
- <cc:Agent
- rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:title>kugelfisch</dc:title>
- <dc:date>2008-07-20T20:09:48</dc:date>
- <dc:description>cartoon globefish</dc:description>
- <dc:source>http://openclipart.org/detail/17968/kugelfisch-by-drunken_duck</dc:source>
- <dc:creator>
- <cc:Agent>
- <dc:title>drunken_duck</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>animal</rdf:li>
- <rdf:li>cartoon</rdf:li>
- <rdf:li>clip art</rdf:li>
- <rdf:li>clipart</rdf:li>
- <rdf:li>fish</rdf:li>
- <rdf:li>globefish</rdf:li>
- <rdf:li>image</rdf:li>
- <rdf:li>kugelfisch</rdf:li>
- <rdf:li>media</rdf:li>
- <rdf:li>public domain</rdf:li>
- <rdf:li>svg</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/src/activities/reversecount/resource/elephant_mer.svg b/src/activities/reversecount/resource/elephant_mer.svg
deleted file mode 100644
index d2410f1b5..000000000
--- a/src/activities/reversecount/resource/elephant_mer.svg
+++ /dev/null
@@ -1,535 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg609"
- sodipodi:version="0.32"
- width="341.99478"
- height="210.37758"
- xml:space="preserve"
- sodipodi:docname="elephant_mer.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0"><metadata
- id="metadata78"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs611"><linearGradient
- id="linearGradient865"><stop
- style="stop-color:#e6eeff;stop-opacity:0.498;"
- offset="0"
- id="stop866" /><stop
- style="stop-color:#d1ffde;stop-opacity:0.702;"
- offset="1"
- id="stop867" /></linearGradient><linearGradient
- id="linearGradient814"><stop
- style="stop-color:#e8d7aa;stop-opacity:1;"
- offset="0"
- id="stop815" /><stop
- style="stop-color:#faffd2;stop-opacity:1;"
- offset="1"
- id="stop816" /></linearGradient><linearGradient
- id="linearGradient811"><stop
- style="stop-color:#d1edf7;stop-opacity:1;"
- offset="0"
- id="stop812" /><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="1"
- id="stop813" /></linearGradient><linearGradient
- id="linearGradient731"><stop
- style="stop-color:#e37a5a;stop-opacity:1;"
- offset="0"
- id="stop732" /><stop
- style="stop-color:#371d32;stop-opacity:1;"
- offset="1"
- id="stop733" /></linearGradient><linearGradient
- id="linearGradient728"><stop
- style="stop-color:#8c7a5a;stop-opacity:1;"
- offset="0"
- id="stop729" /><stop
- style="stop-color:#a79a7a;stop-opacity:1;"
- offset="1"
- id="stop730" /></linearGradient><linearGradient
- id="linearGradient652"><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop653" /><stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop654" /></linearGradient><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient865"
- id="linearGradient2362"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.7696933,0.5650697)"
- spreadMethod="reflect"
- x1="289.41458"
- y1="1009.0089"
- x2="259.96301"
- y2="1016.4215" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient811"
- id="radialGradient2364"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.5789719,0.6333235)"
- cx="215.47537"
- cy="822.61102"
- fx="215.47537"
- fy="822.61102"
- r="135.37086" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient811"
- id="radialGradient2366"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.5802723,0.6328023)"
- cx="259.00861"
- cy="917.4989"
- fx="259.00861"
- fy="917.4989"
- r="135.25948" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient811"
- id="radialGradient2368"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(2.3531015,0.424971)"
- cx="109.32731"
- cy="1146.0132"
- fx="109.32731"
- fy="1146.0132"
- r="38.550976" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient811"
- id="radialGradient2370"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(2.5512675,0.391962)"
- cx="126.15958"
- cy="1157.8818"
- fx="126.15958"
- fy="1157.8818"
- r="47.454552" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient811"
- id="radialGradient2372"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.261335,0.7928108)"
- cx="300.42313"
- cy="684.20215"
- fx="300.42313"
- fy="684.20215"
- r="37.802559" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient731"
- id="radialGradient2404"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.3608892,0.7348137)"
- cx="441.87225"
- cy="499.28876"
- fx="441.87225"
- fy="499.28876"
- r="25.833607" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient814"
- id="linearGradient2406"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.9922395,1.0078212)"
- x1="195.7458"
- y1="299.53891"
- x2="197.06682"
- y2="299.53879" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient814"
- id="linearGradient2408"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.9922418,1.0078188)"
- x1="206.73682"
- y1="300.51489"
- x2="208.05783"
- y2="300.51477" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient652"
- id="radialGradient2410"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0377495,0.9636237)"
- cx="555.92285"
- cy="315.77765"
- fx="555.92285"
- fy="315.77765"
- r="8.866003" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3491"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.3421306,0,0,0.5338644,317.96583,-110.85605)"
- x1="445.4563"
- y1="415.83636"
- x2="513.013"
- y2="375.46069" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3494"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.3338744,0,0,0.5470662,317.96583,-110.85605)"
- x1="145.16628"
- y1="316.01337"
- x2="182.07686"
- y2="293.95355" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3497"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4761265,0,0,0.3836194,317.96583,-110.85605)"
- x1="60.912201"
- y1="484.22644"
- x2="100.2624"
- y2="460.70856" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3500"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.1138263,-0.07724893,-0.6356514,1.1732595,381.69341,-88.561474)"
- x1="250.96735"
- y1="149.94254"
- x2="266.88181"
- y2="140.43118" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3503"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.09218426,-0.09613414,-0.8829603,1.06058,411.60916,-51.75916)"
- x1="263.58371"
- y1="142.36064"
- x2="278.98901"
- y2="133.15358" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3506"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4092457,0,0,0.4463122,317.96583,-110.85605)"
- x1="581.00067"
- y1="362.39807"
- x2="600.07782"
- y2="350.99649" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3509"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.3940222,0,0,0.463556,317.96583,-110.85605)"
- x1="606.28613"
- y1="379.98938"
- x2="631.04633"
- y2="365.19128" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3512"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4100591,0,0,0.4454269,317.96583,-110.85605)"
- x1="514.35358"
- y1="379.5419"
- x2="584.48041"
- y2="337.63019" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3515"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4420327,0,0,0.4132078,317.96583,-110.85605)"
- x1="433.47263"
- y1="520.69623"
- x2="514.58533"
- y2="472.21869" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3518"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4660971,0,0,0.3918741,317.96583,-110.85605)"
- x1="381.54404"
- y1="569.53687"
- x2="475.6228"
- y2="513.31012" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3521"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4380169,0,0,0.4169961,317.96583,-110.85605)"
- x1="447.36298"
- y1="486.64923"
- x2="524.48737"
- y2="440.55539" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3524"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4432469,0,0,0.4120759,317.96583,-110.85605)"
- x1="467.73123"
- y1="445.72177"
- x2="533.96826"
- y2="406.13477" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3527"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.4239728,0,0,0.4308092,317.96583,-110.85605)"
- x1="483.37405"
- y1="452.84113"
- x2="553.76691"
- y2="410.77042" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3530"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.5277611,0,0,0.3460871,317.96583,-110.85605)"
- x1="226.21547"
- y1="775.99817"
- x2="297.3269"
- y2="733.49799" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient3533"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.5830367,0,0,0.3132759,317.96583,-110.85605)"
- x1="84.524689"
- y1="791.27991"
- x2="280.60184"
- y2="674.0932" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient4649"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.6284482,0,0,0.2906387,317.8713,-114.75106)"
- x1="401.13232"
- y1="507.52625"
- x2="414.27173"
- y2="499.6734" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient4652"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.5989131,0,0,0.3049714,317.8713,-114.75106)"
- x1="423.70087"
- y1="542.13959"
- x2="444.56418"
- y2="529.67047" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient4655"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.5630309,0,0,0.3244074,317.8713,-114.75106)"
- x1="450.57037"
- y1="492.65982"
- x2="470.73666"
- y2="480.6073" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient4658"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.5849456,0,0,0.3122536,317.8713,-114.75106)"
- x1="433.83749"
- y1="520.02026"
- x2="454.15494"
- y2="507.87738" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient728"
- id="linearGradient4661"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.3771482,0,0,0.4842959,317.8713,-114.75106)"
- x1="645.52417"
- y1="342.4176"
- x2="693.5155"
- y2="313.73529" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="0.36014218"
- inkscape:cx="115.04071"
- inkscape:cy="58.482982"
- inkscape:window-width="910"
- inkscape:window-height="627"
- inkscape:window-x="6"
- inkscape:window-y="50"
- inkscape:current-layer="svg609"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="0" /><g
- id="g868"
- transform="matrix(0.7999998,0,0,0.7999998,-95.281832,-180.93881)"><path
- id="path864"
- d="m 133.2453,533.6385 c 5.5681,34.522 3.3747,28.8354 2.261,49.9939 8.3522,6.6817 8.3587,9.7118 27.7892,11.1023 l 63.3029,4.5299 72.7521,19.885 70.3898,4.53 57.397,9.2546 c 21.4051,3.4513 43.2459,1.2613 60.3377,-12.1228 12.7171,-10.6976 16.0188,-14.1161 28.7902,-21.2051 13.3091,-8.6185 21.9494,-36.5789 32.3335,-49.5531 1.9919,-2.4889 3.7393,-10.95 4.4278,-22.3305 l -5.3327,-27.3737 c 8.3192,12.2125 -0.032,8.6775 -4.9887,15.0533 l -55.7787,71.749 c -10.0825,12.9692 -37.1728,15.6215 -44.13,14.4011 L 151.1727,550.402 c -10.1569,-1.7815 -13.043,-7.3735 -17.9274,-16.7635 z"
- style="font-size:12px;fill:url(#linearGradient2362);fill-rule:evenodd"
- transform="matrix(-1,0,0,1,673.0787,-145.2411)"
- inkscape:connector-curvature="0" /><g
- style="font-size:12px;fill:url(#radialGradient2364)"
- transform="matrix(-1,0,0,1,673.0787,-145.2411)"
- id="g664"><path
- sodipodi:nodetypes="cssssssssssssssss"
- id="path617"
- d="m 623.051,558.1809 c 0,15.568 -7.0191,19.9901 -10.3755,32.0402 -3.3565,12.05 -17.2242,18.7352 -26.1969,27.018 -8.9726,8.2828 -15.7042,24.2113 -29.8988,34.2407 -23.9356,16.0777 -12.2147,15.9108 -55.7354,13.5484 -26.9426,-1.5032 -69.3756,-10.3159 -100.6566,-7.864 -32.5148,1.3207 -84.5245,-23.6695 -95.4165,-28.1135 -29.042,-8.6998 -54.9636,0.983 -76.3594,-0.811 -21.3322,-0.6076 -32.8545,-7.2443 -32.8545,-22.8123 0,-15.568 16.6899,-39.2577 22.7593,-50.1266 6.0694,-10.8689 20.417,-27.8155 29.9064,-34.6218 9.4894,-6.8064 4.6714,-16.4651 14.9313,-19.8454 10.2601,-3.3802 20.2271,-5.6568 28.6241,-5.797 26.9684,-0.4504 49.0001,3.7456 84.5628,5.0219 35.5625,1.2762 79.9474,20.1629 113.8722,24.4593 33.9248,4.2963 64.4766,3.4517 86.5471,12.5119 22.0706,9.0603 46.2904,5.5832 46.2904,21.1512 z"
- style="font-size:12px;fill:url(#radialGradient2366);fill-rule:evenodd"
- transform="translate(-69.07462,-59.47551)"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="csccc"
- id="path622"
- d="m 259.8558,470.6394 c 0.2953,4.8109 101.675,22.8503 86.5853,30.6898 -11.7556,4.8107 -109.2553,-5.2947 -125.5638,-7.657 -32.6169,0 -33.0725,15.1098 -54.3334,7.6774 7.087,-10.9758 42.5219,-10.9759 93.3119,-30.7102 z"
- style="font-size:12px;fill:url(#radialGradient2368);fill-opacity:0.38670002;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path624"
- d="m 442.9361,470.6393 c -29.5291,3.8003 -43.3636,2.9529 -112.2105,-15.9457 -53.4917,0 -129.928,-1.515 -129.928,-13.5834 0,-12.0681 50.4507,-1.7717 103.9424,-1.7717 46.4046,7.087 100.3989,23.9573 138.1961,31.3008 z"
- style="font-size:12px;fill:url(#radialGradient2370);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path803"
- d="m 414.393,546.905 c -4.7811,2.0921 -16.5739,52.7595 -74.3538,5.2466 8.942,-10.741 -12.8739,-35.4109 -8.0929,-37.5029 41.2815,-6.7084 77.6712,3.4554 90.3585,12.0335 11.5062,26.2957 -3.1308,18.1308 -7.9118,20.2228 z"
- style="font-size:12px;fill:url(#radialGradient2372);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g></g><path
- sodipodi:nodetypes="cscssssssssscsssscccsss"
- id="path614"
- d="m 84.768758,157.24214 c 23.514952,7.24644 53.732232,1.58251 62.266832,-1.15525 8.53459,-2.73777 19.01276,-7.34113 32.62255,-13.0524 19.82911,-10.63483 55.72318,-14.15017 64.84306,-34.66314 1.13994,-2.5641 6.59801,-4.11981 10.65636,-5.66819 3.10766,-1.03484 23.88767,-7.59689 25.41476,-13.77196 0.37471,-1.60327 35.97654,-7.44494 33.00488,-9.88031 -0.74291,-0.60889 -3.44912,-7.73719 -7.30497,-7.88712 -3.85585,-0.14998 -7.24749,2.09867 -12.0059,3.83536 -4.7584,1.7367 -9.30002,-3.82126 -12.92645,-1.88454 -2.17487,0.96458 -6.10181,3.42288 -7.08994,2.58119 -1.32395,-0.86389 4.58335,-5.6208 8.83723,-10.6063 4.76921,-5.36738 11.0869,-12.47317 11.79551,-14.52206 6.52071,-7.74085 -6.80262,-4.32059 -13.87155,-7.16104 C 275.2966,41.03942 278.01276,25.2319 274.25022,24.94294 260.84647,23.90004 246.61807,67.0309 245.95442,69.41961 243.21074,78.46452 215.29665,58.99105 202.89188,52.0993 189.92971,45.72104 169.96542,43.05666 145.71261,46.92245 126.35655,39.56302 123.97608,31.82221 118.21797,22.57855 93.049458,82.68569 73.461958,62.74819 58.512788,60.51831 c -2.40616,11.70309 -2.95391,8.97301 0.25342,21.37605 3.81446,12.82646 2.45936,27.01566 0.95504,36.7644 -5.26074,30.8668 8.26676,33.41213 25.04751,38.58338 z"
- style="font-size:12px;fill:url(#linearGradient3533);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path619"
- d="m 143.40954,145.16703 c 12.66941,6.23254 24.13942,22.05737 46.10262,22.05737 31.41947,-5.01331 36.88167,-8.96569 -14.80608,-26.74442 -5.59547,-21.98779 -10.47449,-28.62978 -32.43765,-28.62978 -26.94026,0 -5.89744,27.87209 1.14111,33.31683 z"
- style="font-size:12px;fill:url(#linearGradient3530);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccssccs"
- id="path632"
- d="m 88.233908,78.66128 c -13.59299,10.88889 -28.18924,0.69629 -30.48419,-2.92445 -0.53551,10.17226 0.99988,13.98818 3.61131,15.63345 4.18216,2.60927 10.95392,4.87989 16.91891,4.55901 26.248172,-1.39303 45.221432,-57.91619 46.179452,-63.62755 1.19642,-1.47423 -1.09602,-3.18339 -2.45904,-4.57533 -2.77539,12.72297 -13.08058,34.2248 -33.766442,50.93487 z"
- style="font-size:12px;fill:url(#linearGradient3527);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccssccs"
- id="path631"
- d="m 87.530058,65.26925 c -10.38267,6.37251 -30.52676,8.0483 -29.62937,-1.42712 -3.45949,14.55891 -0.80492,12.24285 -0.1315,12.75896 7.69308,5.75671 14.19382,7.04479 20.15881,6.72396 26.248212,-1.39303 43.307182,-50.06243 44.265212,-55.77375 0.32544,-2.58824 -2.40652,-3.11792 -4.43372,-5.59385 -7.24126,32.95525 -22.202872,38.53771 -30.229432,43.3118 z"
- style="font-size:12px;fill:url(#linearGradient3524);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccsccs"
- id="path633"
- d="m 89.993538,90.47777 c -13.59298,10.88889 -27.01778,1.9496 -29.56166,0.27851 -2.58852,9.19741 -0.0173,7.63551 1.33567,8.04388 6.32852,4.98749 5.46361,4.11392 18.27203,5.60339 26.147262,2.92685 54.218452,-54.36716 55.176522,-60.07847 0.69872,-4.67706 -1.65355,-3.26265 -10.73089,-12.17444 -4.21355,12.21811 -13.8058,41.61706 -34.491672,58.32713 z"
- style="font-size:12px;fill:url(#linearGradient3521);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccscsss"
- id="path634"
- d="m 106.32807,106.58736 c -23.447012,18.76651 -45.158372,0.36587 -44.964822,-5.7615 -9.53202,17.69852 8.27051,33.18037 33.63846,21.95496 24.598462,-10.3447 61.456492,-71.56282 62.414522,-77.27409 -2.30072,-2.4758 -7.89239,0.64379 -11.67716,-0.22932 -4.25645,-1.12121 -4.79778,-2.51826 -5.41708,-0.91644 -5.0112,11.83494 -13.30838,45.51587 -33.99392,62.22639 z"
- style="font-size:12px;fill:url(#linearGradient3518);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccssccs"
- id="path646"
- d="m 90.722398,101.49972 c -15.52342,6.93976 -28.51097,-1.53188 -30.80591,-5.15261 -0.53551,10.17225 1.21108,13.38575 3.43533,15.63344 3.68446,4.28036 6.61316,8.75807 29.36145,1.21679 33.074962,-10.79964 46.629162,-62.63697 47.587232,-68.34838 1.19638,-1.47423 -3.55955,-1.60783 -4.92257,-2.99977 -4.76623,13.83703 -21.97887,49.06783 -44.655532,59.65053 z"
- style="font-size:12px;fill:url(#linearGradient3515);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path657"
- d="m 53.685728,37.13831 c 0,19.84291 0.0131,33.14352 20.90353,33.14352 20.89032,0 39.318452,-24.99832 43.797772,-47.06935 C 113.49537,16.18139 103.57824,0 82.687878,0 61.797438,0 53.685728,17.29545 53.685728,37.13831 z"
- style="font-size:12px;fill:url(#linearGradient3512);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="csssccc"
- id="path675"
- d="m 64.793808,50.45159 c -0.85421,2.28047 -4.95783,14.44605 -3.52069,16.34483 3.17578,3.905 7.02518,2.75644 10.56902,2.82842 7.19946,0.33969 6.2798,-10.55083 7.54348,-12.69729 1.75944,-2.60086 4.35571,-4.35952 3.28558,-12.38956 -0.11748,-4.33362 -3.03257,14.84275 -11.33346,18.38613 -12.5075,5.95556 -3.74046,-11.13417 -6.54393,-12.47253 z"
- style="font-size:12px;fill:url(#linearGradient3509);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path664"
- d="m 65.984568,46.69557 c 0,2.93675 3.09866,7.48373 8.0064,7.48373 4.9077,0 8.3583,-3.56228 9.23812,-7.08988 0.52787,-1.75505 -3.80246,-18.1186 -15.92469,-9.65012 -1.74045,3.93885 -1.84771,5.33482 -1.31983,9.25627 z"
- style="font-size:12px;fill:url(#linearGradient3506);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path687"
- d="m 272.3471,55.89711 c -9.93133,11.92914 -19.15796,21.0094 -18.15244,22.05801 1.00553,1.04861 9.39893,-7.11924 19.33027,-19.04837 9.93133,-11.9292 14.65359,-14.1898 13.64806,-15.23842 -1.0055,-1.04859 -4.89452,0.29961 -14.82589,12.22878 z"
- style="font-size:12px;fill:url(#linearGradient3503);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path688"
- d="m 264.36851,48.94712 c -7.55357,13.94209 -14.50895,23.49961 -13.33378,24.29721 1.67294,1.35457 8.27633,-7.86084 15.82992,-21.80291 7.55359,-13.94213 11.20617,-17.30473 10.03099,-18.10227 -1.1752,-0.79756 -4.97354,1.66584 -12.52713,15.60797 z"
- style="font-size:12px;fill:url(#linearGradient3500);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path689"
- d="m 281.30593,60.0272 c -9.93133,11.92911 -15.09519,14.54403 -27.11109,20.71313 7.69219,-0.92077 20.82112,-4.98663 30.75242,-16.91579 9.93133,-11.9292 12.19008,-15.76533 11.18455,-16.81392 -1.00551,-1.04859 -4.89453,1.08738 -14.82588,13.01658 z"
- style="font-size:12px;fill:url(#linearGradient3497);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path690"
- d="m 262.33702,40.61866 c -8.61649,13.1473 -14.30414,30.08899 -15.41233,29.17921 -1.75855,-1.21113 4.5423,-18.53873 13.15879,-31.68611 8.61652,-13.14735 12.99489,-14.39008 14.10308,-13.48034 1.10818,0.90978 -3.23302,2.83985 -11.84954,15.98724 z"
- style="font-size:12px;fill:url(#linearGradient3494);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cscscs"
- id="path691"
- d="m 170.76469,60.36237 c 1.29397,-2.06029 7.39647,-13.79466 1.12535,-15.67844 -5.04461,-1.40966 -11.74665,-0.67883 -14.80171,1.10271 -5.36044,5.934 -12.67709,13.21643 -16.74715,19.80181 -8.99161,13.97923 -27.57071,39.54575 -11.09152,59.50318 -6.61305,-36.71172 21.66527,-33.51829 41.51503,-64.72926 z"
- style="font-size:12px;fill:url(#linearGradient3491);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- id="g801"
- transform="matrix(0.7999998,0,0,0.7999998,-95.281832,-180.93881)"><g
- id="g786"><path
- style="font-size:12px;fill:url(#radialGradient2404);fill-rule:evenodd"
- d="m 614.6075,361.2701 c -2.1063,14.3337 22.6234,18.9897 25.5779,19.8608 -5.6344,16.0712 -47.1536,1.1463 -49.328,-19.7219 11.4091,5.7418 18.2306,4.0198 23.7501,-0.1389 z"
- id="path701"
- sodipodi:nodetypes="cccc"
- transform="matrix(-0.50497,0,0,0.565168,516.5597,87.60347)"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:url(#linearGradient2406);fill-rule:evenodd;stroke-width:1"
- d="m 197.5039,302.4364 c 0,1.68 -4.2354,1.68 -4.2354,0 0,-1.68 0.9481,-3.0419 2.1177,-3.0419 1.1697,0 2.1177,1.3619 2.1177,3.0419 z"
- id="path785"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:url(#linearGradient2408);fill-rule:evenodd;stroke-width:1"
- d="m 208.4101,303.4193 c 0,1.68 -4.2354,1.68 -4.2354,0 0,-1.68 0.9481,-3.0419 2.1177,-3.0419 1.1697,0 2.1177,1.3619 2.1177,3.0419 z"
- id="path783"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" /></g><g
- id="g702"
- transform="matrix(-0.50497,0,0,0.565168,512.8269,94.91457)"
- style="font-size:12px"><path
- sodipodi:type="arc"
- style="font-size:12px;fill:#f1f1f4;fill-rule:evenodd;stroke-width:1"
- id="path649"
- d="m 580.27701,295.90765 a 10.472076,13.552139 0 0 1 -10.47208,13.55214 10.472076,13.552139 0 0 1 -10.47207,-13.55214 10.472076,13.552139 0 0 1 10.47207,-13.55214 10.472076,13.552139 0 0 1 10.47208,13.55214 z"
- sodipodi:cx="569.80493"
- sodipodi:cy="295.90765"
- sodipodi:rx="10.472076"
- sodipodi:ry="13.552139"
- transform="translate(-2.464017,0.615936)" /><path
- sodipodi:type="arc"
- style="font-size:12px;fill:url(#radialGradient2410);fill-rule:evenodd;stroke-width:1"
- id="path650"
- d="m 580.27698,303.91571 a 8.6240845,8.0080719 0 0 1 -8.62409,8.00807 8.6240845,8.0080719 0 0 1 -8.62408,-8.00807 8.6240845,8.0080719 0 0 1 8.62408,-8.00807 8.6240845,8.0080719 0 0 1 8.62409,8.00807 z"
- sodipodi:cx="571.65289"
- sodipodi:cy="303.91571"
- sodipodi:rx="8.6240845"
- sodipodi:ry="8.0080719"
- transform="translate(-4.131612,-1.922867)" /></g><path
- style="font-size:12px;fill:none;stroke:#000000;stroke-width:0.625;stroke-linecap:round;stroke-dasharray:none"
- d="m 211.1274,275.4472 c 8.9041,-2.9786 16.9882,-1.3773 25.1811,1.2011 m -23.7276,0.2632 c 9.1648,-1.7233 17.0099,0.9847 24.855,4.6773 m -23.9377,-3.1475 c 9.2747,-0.6556 16.8283,2.9439 24.291,7.5229 m -23.3551,-6.1136 c 9.2378,1.1336 16.1281,6.1293 22.779,12.0725"
- id="path800"
- inkscape:connector-curvature="0" /></g><path
- sodipodi:nodetypes="csccsc"
- id="path616"
- d="m 51.235768,24.10471 c -13.21712,13.22909 -11.05407,25.79056 -8.46119,30.64779 3.39861,5.43425 6.51346,3.20636 13.40606,5.27469 10.30135,0 16.17087,2.02181 11.69155,-22.21458 3.48393,-8.56894 18.87626,-2.86323 11.86978,-24.40223 -1.63061,-5.01254 -28.5062,-13.54192 -28.5062,10.69433 z"
- style="font-size:12px;fill:url(#linearGradient4661);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccscs"
- id="path679"
- d="m 47.589648,49.18578 c 7.73949,3.19144 21.79094,-2.99946 21.17605,-5.36688 0.25628,1.39257 -9.42039,7.61417 -21.0553,3.29032 -4.90875,-1.84394 -4.77391,-9.07502 -4.53245,-11.30313 -1.12709,1.1141 -3.19856,10.19033 4.4117,13.37969 z"
- style="font-size:12px;fill:url(#linearGradient4658);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccscs"
- id="path680"
- d="m 48.585088,46.53984 c 7.73949,3.19144 20.67108,-1.60688 20.05623,-3.9743 0.25628,1.39257 -8.30058,6.22159 -19.93549,1.89774 -4.90875,-1.84394 -4.64948,-9.35353 -4.40798,-11.58164 -1.12709,1.1141 -3.32302,10.46885 4.28724,13.6582 z"
- style="font-size:12px;fill:url(#linearGradient4655);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccscs"
- id="path681"
- d="m 46.594248,52.11018 c 11.09896,3.74847 23.03519,-4.8098 22.4203,-7.17727 0.25632,1.39258 -9.04708,9.98159 -22.29955,5.10071 -4.93202,-1.76463 -4.89837,-9.07501 -4.65683,-11.30313 -1.12709,1.1141 -3.23625,10.72499 4.53608,13.37969 z"
- style="font-size:12px;fill:url(#linearGradient4652);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccscs"
- id="path684"
- d="m 54.434368,33.61287 c 5.6286,1.86293 15.03316,-0.93799 14.586,-2.31994 0.18639,0.81289 -6.03661,3.63172 -14.49817,1.10777 -3.5699,-1.07635 -3.38136,-5.45993 -3.20571,-6.76054 -0.81971,0.65031 -2.41671,6.11096 3.11788,7.97271 z"
- style="font-size:12px;fill:url(#linearGradient4649);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/epaulard.svg b/src/activities/reversecount/resource/epaulard.svg
deleted file mode 100644
index da7533f57..000000000
--- a/src/activities/reversecount/resource/epaulard.svg
+++ /dev/null
@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg1205"
- sodipodi:version="0.32"
- width="257.21585"
- height="365.40814"
- xml:space="preserve"
- sodipodi:docname="epaulard.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.0"><metadata
- id="metadata71"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs1207"><linearGradient
- id="linearGradient669"><stop
- style="stop-color:#02a5b7;stop-opacity:0.5216;"
- offset="0"
- id="stop670" /><stop
- style="stop-color:#8dedcf;stop-opacity:0.5216;"
- offset="1"
- id="stop671" /></linearGradient><linearGradient
- id="linearGradient1251"><stop
- style="stop-color:#dabf92;stop-opacity:1;"
- offset="0"
- id="stop1252" /><stop
- style="stop-color:#eeedcf;stop-opacity:1;"
- offset="1"
- id="stop1253" /></linearGradient><linearGradient
- id="linearGradient1241"><stop
- style="stop-color:#af0500;stop-opacity:1;"
- offset="0"
- id="stop1242" /><stop
- style="stop-color:#5f0000;stop-opacity:1;"
- offset="1"
- id="stop1243" /></linearGradient><linearGradient
- id="linearGradient1236"><stop
- style="stop-color:#f2f7f7;stop-opacity:1;"
- offset="0"
- id="stop1237" /><stop
- style="stop-color:#cfcfcf;stop-opacity:1;"
- offset="1"
- id="stop1238" /></linearGradient><linearGradient
- id="linearGradient1230"><stop
- style="stop-color:#f2f7f7;stop-opacity:1;"
- offset="0"
- id="stop1231" /><stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop1232" /></linearGradient><linearGradient
- id="linearGradient1225"><stop
- style="stop-color:#f2f7f7;stop-opacity:1;"
- offset="0"
- id="stop1226" /><stop
- style="stop-color:#4c4c4c;stop-opacity:0;"
- offset="1"
- id="stop1227" /></linearGradient><linearGradient
- id="linearGradient1219"><stop
- style="stop-color:#000;stop-opacity:1;"
- offset="0"
- id="stop1220" /><stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop1221" /></linearGradient><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1219"
- id="radialGradient3703"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.6990736,1.4304645)"
- cx="524.67535"
- cy="554.05542"
- fx="524.67535"
- fy="554.05542"
- r="127.35264" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1219"
- id="radialGradient3705"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.6837645,1.4624918)"
- cx="557.60529"
- cy="546.98444"
- fx="557.60529"
- fy="546.98444"
- r="188.63609" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1241"
- id="linearGradient3707"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.8471046,1.1804918)"
- x1="460.93085"
- y1="595.76068"
- x2="441.58255"
- y2="619.43408" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3709"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0880639,0.9190637)"
- x1="316.98114"
- y1="790.70459"
- x2="323.3576"
- y2="790.70459" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3711"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0996796,0.9093558)"
- x1="309.58737"
- y1="791.08435"
- x2="315.91974"
- y2="791.08435" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3713"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1078842,0.9026214)"
- x1="304.00854"
- y1="788.25415"
- x2="310.30707"
- y2="788.25415" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3715"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1053773,0.9046685)"
- x1="302.85712"
- y1="778.06604"
- x2="309.16626"
- y2="778.06604" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3717"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1066936,0.9035925)"
- x1="301.76508"
- y1="770.42102"
- x2="308.0687"
- y2="770.42102" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3719"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1078848,0.9026209)"
- x1="308.77328"
- y1="750.46387"
- x2="315.07184"
- y2="750.46387" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3721"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1078833,0.9026222)"
- x1="303.64215"
- y1="754.51172"
- x2="309.94067"
- y2="754.51172" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3723"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1078834,0.9026221)"
- x1="301.44296"
- y1="762.15991"
- x2="307.74149"
- y2="762.15991" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3725"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0342705,0.966865)"
- x1="344.78366"
- y1="765.69647"
- x2="351.30283"
- y2="765.69647" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3727"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0850527,0.9216142)"
- x1="322.69653"
- y1="796.00464"
- x2="329.08377"
- y2="796.00464" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3729"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1066226,0.9036504)"
- x1="334.1937"
- y1="773.86157"
- x2="339.73352"
- y2="773.86157" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3731"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1154765,0.8964779)"
- x1="326.32239"
- y1="774.92114"
- x2="331.83478"
- y2="774.92114" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3733"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1154755,0.8964787)"
- x1="321.95422"
- y1="768.89923"
- x2="327.46661"
- y2="768.89923" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3735"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1213548,0.8917784)"
- x1="315.92532"
- y1="766.53479"
- x2="321.41861"
- y2="766.53479" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3737"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.1238801,0.8897746)"
- x1="310.52042"
- y1="763.19354"
- x2="316.00531"
- y2="763.19354" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3739"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0947821,0.9134237)"
- x1="343.16135"
- y1="769.34241"
- x2="348.73535"
- y2="769.34241" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1251"
- id="linearGradient3741"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0331591,0.9679052)"
- x1="352.45581"
- y1="770.75446"
- x2="358.97672"
- y2="770.75446" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1219"
- id="linearGradient3743"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.2314136,0.03733821,0.1014999,-0.6290737,45.1489,840.14398)"
- x1="326.4938"
- y1="1067.5934"
- x2="2638.5845"
- y2="1162.0775" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1219"
- id="linearGradient3745"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0034988,0.9965134)"
- x1="470.54218"
- y1="903.75897"
- x2="560.44086"
- y2="681.63354" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1230"
- id="radialGradient3747"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.7795116,0.5619519)"
- cx="280.29745"
- cy="1425.9041"
- fx="280.29745"
- fy="1425.9041"
- r="8.4654083" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1219"
- id="linearGradient3749"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.8169204,1.2241094)"
- x1="960.28302"
- y1="764.90192"
- x2="821.96027"
- y2="771.93469" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1225"
- id="radialGradient3751"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.9021936,1.1084095)"
- cx="729.70435"
- cy="734.72784"
- fx="729.70435"
- fy="734.72784"
- r="44.774738" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1236"
- id="linearGradient3753"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.7033475,1.4217722)"
- x1="474.52533"
- y1="449.08334"
- x2="416.56439"
- y2="451.38849" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1236"
- id="linearGradient3755"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3969292,0.06404391,0.2267152,-1.40513,-9.074221,960.8435)"
- x1="997.41699"
- y1="581.42175"
- x2="256.09552"
- y2="599.78528" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1219"
- id="linearGradient3757"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.7011157,1.4262981)"
- x1="429.6355"
- y1="542.75342"
- x2="-261.00098"
- y2="573.55011" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient669"
- id="linearGradient3759"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.7786846,0,0,-1.2842169,0,1052.3622)"
- x1="192.63243"
- y1="509.69897"
- x2="605.61871"
- y2="509.69897" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="1.4405687"
- inkscape:cx="21.80687"
- inkscape:cy="133.95819"
- inkscape:window-width="822"
- inkscape:window-height="592"
- inkscape:window-x="281"
- inkscape:window-y="58"
- inkscape:current-layer="g2236"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="0" /><g
- id="g2236"
- transform="matrix(0.8,0,0,0.8,-120.05,-382.69186)"><g
- style="font-size:12px"
- transform="matrix(0.306446,-0.04944456,0.07664798,0.475047,45.1489,212.2182)"
- id="g1272"><path
- sodipodi:nodetypes="ccsssc"
- id="path1213"
- d="m 380.4929,705.205 c 0,23.0638 5.5524,58.7163 14.1445,97.5268 -18.3893,-0.8859 -9.3032,-38.4984 -37.3294,-55.3268 -30.4919,-15.9466 -29.3533,-62.0553 -21.933,-70.6551 8.1206,-9.3427 13.6652,-2.6139 27.0177,12.7161 8.5287,9.2583 18.1002,10.9834 18.1002,15.739 z"
- style="font-size:12px;fill:url(#radialGradient3703);fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccsssc"
- id="path1214"
- d="m 383.1324,713.9633 c 0,20.9926 4.5163,53.4432 11.505,88.7683 -8.3855,-0.6109 -7.8353,-41.8888 -25.6074,-52.7332 -29.2656,-17.9839 -33.2709,-53.7166 -27.2352,-61.544 6.6051,-8.5037 11.5017,-2.3791 22.3626,11.5741 6.9371,8.4269 18.975,9.6062 18.975,13.9348 z"
- style="font-size:12px;fill:url(#radialGradient3705);fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1245"
- d="m 378.4668,725.4677 c 14.6188,39.7612 1.6242,31.2335 -19.492,10.5581 -15.431,-10.5235 -20.1897,-39.3899 -8.5277,-39.3899 11.6622,0 39.796,16.2779 28.0197,28.8318 z"
- style="font-size:12px;fill:url(#linearGradient3707);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1254"
- d="m 347.8229,732.4957 c -2.6166,0.761 -4.2043,-4.6979 -1.5878,-5.459 2.6168,-0.7611 5.0934,-0.156 5.5318,1.3514 0.4385,1.5075 -1.3273,3.3465 -3.944,4.1076 z"
- style="font-size:12px;fill:url(#linearGradient3709);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1255"
- d="m 343.0288,725.1063 c -2.6822,0.4807 -3.6852,-5.1154 -1.0029,-5.5961 2.6825,-0.4807 5.0814,0.3823 5.3584,1.9275 0.2769,1.5454 -1.673,3.1878 -4.3555,3.6686 z"
- style="font-size:12px;fill:url(#linearGradient3711);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1256"
- d="m 338.85,717.1803 c -2.725,0 -2.725,-5.6852 0,-5.6852 2.7252,0 4.9343,1.2727 4.9343,2.8425 0,1.57 -2.2091,2.8427 -4.9343,2.8427 z"
- style="font-size:12px;fill:url(#linearGradient3713);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1257"
- d="m 337.0997,709.5907 c -2.7123,0.2622 -3.2594,-5.3966 -0.547,-5.6588 2.7125,-0.2623 5.0339,0.792 5.1849,2.3545 0.1511,1.5627 -1.9253,3.0421 -4.6379,3.3043 z"
- style="font-size:12px;fill:url(#linearGradient3715);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1258"
- d="m 336.1982,701.8384 c -2.7191,0.18 -3.0945,-5.4928 -0.3755,-5.6728 2.7193,-0.1799 5.0076,0.9441 5.1113,2.5105 0.1037,1.5666 -2.0166,2.9824 -4.7358,3.1623 z"
- style="font-size:12px;fill:url(#linearGradient3717);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1259"
- d="m 344.129,683.0696 c -2.725,0 -2.725,-5.6852 0,-5.6852 2.7252,0 4.9343,1.2727 4.9343,2.8425 0,1.57 -2.2091,2.8427 -4.9343,2.8427 z"
- style="font-size:12px;fill:url(#linearGradient3719);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1260"
- d="m 338.4438,686.7242 c -2.725,0 -2.725,-5.6852 0,-5.6852 2.7252,0 4.9343,1.2727 4.9343,2.8425 0,1.57 -2.2091,2.8427 -4.9343,2.8427 z"
- style="font-size:12px;fill:url(#linearGradient3721);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1261"
- d="m 336.0074,693.6276 c -2.725,0 -2.725,-5.6852 0,-5.6852 2.7252,0 4.9343,1.2727 4.9343,2.8425 0,1.57 -2.2091,2.8427 -4.9343,2.8427 z"
- style="font-size:12px;fill:url(#linearGradient3723);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1262"
- d="m 360.5941,746.3166 c -2.2394,1.5527 -5.4786,-3.1194 -3.2393,-4.6721 2.2396,-1.5527 4.7802,-1.7654 5.6747,-0.4754 0.8945,1.2903 -0.1958,3.5948 -2.4354,5.1475 z"
- style="font-size:12px;fill:url(#linearGradient3725);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1263"
- d="m 353.1456,739.4115 c -2.5986,0.8205 -4.3101,-4.601 -1.7116,-5.4214 2.5988,-0.8204 5.0886,-0.2718 5.5612,1.2252 0.4727,1.4972 -1.2508,3.3759 -3.8496,4.1962 z"
- style="font-size:12px;fill:url(#linearGradient3727);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1264"
- d="m 372.2832,704.2557 c -2.3345,0.5893 -3.5272,-4.1356 -1.1926,-4.7249 2.3349,-0.5893 4.4945,-0.009 4.8238,1.2953 0.3294,1.3048 -1.2963,2.8403 -3.6312,3.4296 z"
- style="font-size:12px;fill:url(#linearGradient3729);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1265"
- d="m 366.2605,699.6158 c -2.3714,0.4169 -3.2151,-4.3826 -0.8437,-4.7995 2.3718,-0.4169 4.4832,0.3196 4.7161,1.6448 0.233,1.3254 -1.5006,2.7378 -3.8724,3.1547 z"
- style="font-size:12px;fill:url(#linearGradient3731);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1266"
- d="m 361.3876,694.2179 c -2.3714,0.4169 -3.2151,-4.3826 -0.8437,-4.7995 2.3718,-0.4169 4.4832,0.3195 4.7161,1.6448 0.233,1.3254 -1.5006,2.7378 -3.8724,3.1547 z"
- style="font-size:12px;fill:url(#linearGradient3733);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1267"
- d="m 356.3353,688.4685 c -2.3946,0.2518 -2.9042,-4.5946 -0.5096,-4.8464 2.3949,-0.2517 4.4503,0.6291 4.591,1.9673 0.1407,1.3383 -1.6865,2.6273 -4.0814,2.8791 z"
- style="font-size:12px;fill:url(#linearGradient3735);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1268"
- d="m 350.9298,683.9479 c -2.4041,0.1318 -2.671,-4.734 -0.2668,-4.8658 2.4045,-0.1319 4.4133,0.8505 4.487,2.194 0.0737,1.3437 -1.8157,2.5399 -4.2202,2.6718 z"
- style="font-size:12px;fill:url(#linearGradient3737);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1269"
- d="m 378.3616,707.7411 c -2.2818,0.7686 -3.8373,-3.8496 -1.5554,-4.6182 2.2822,-0.7685 4.4803,-0.3577 4.9097,0.9174 0.4296,1.2754 -1.0721,2.9323 -3.3543,3.7008 z"
- style="font-size:12px;fill:url(#linearGradient3739);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1271"
- d="m 368.1559,752.0114 c -2.2303,1.5657 -5.4968,-3.0874 -3.2665,-4.6531 2.2304,-1.5658 4.7697,-1.7934 5.6717,-0.5086 0.9021,1.2849 -0.1747,3.5959 -2.4052,5.1617 z"
- style="font-size:12px;fill:url(#linearGradient3741);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><path
- id="path1211"
- d="m 227.0625,478.375 c -1.34845,0.061 -2.69905,0.39453 -4.5,0.875 -21.62845,5.56717 -2.05462,80.50846 4.9375,94.53125 -3.5961,1.60438 -6.24246,-16.59668 -13.9375,-23.25 -9.78613,-7.71854 -13.07445,-17.12244 -14.09375,-28.625 -0.29037,-3.60242 0.44523,-6.03617 2.59375,-7.28125 -11.35806,-1.25268 -7.21675,36.53673 5.5625,78.15625 10.96557,98.47999 28.77804,168.13049 31.03125,176.75 17.7818,70.29958 31.90796,115.02409 45.3125,141.375 3.26951,6.60303 4.71634,15.18688 4.71875,24.21875 l 76.125,0 c 8.86569,-24.30185 15.39924,-56.75693 16.15625,-101.90625 -4.5884,-84.78865 -0.60241,-200.46357 -55.75,-294.375 -38.11229,-65.41087 -67.98253,-46.27123 -75.25,-50.59375 -14.9506,-7.8116 -18.8609,-10.058 -22.90625,-9.875 z M 171.59375,928 c -8.42917,0.17302 -14.96758,2.50654 -18.59375,5.375 -0.79523,0.46257 -1.28355,1.03756 -1.53125,1.75 l 49.25,0 c -10.89162,-5.40757 -20.90893,-7.29364 -29.125,-7.125 z"
- style="font-size:12px;fill:url(#linearGradient3743);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.627654,-0.101271,0.143375,0.888606,-9.074221,91.51868)"
- sodipodi:nodetypes="csccs"
- id="path1325"
- d="m 538.0384,842.3831 c 36.9786,49.0198 19.6857,74.6004 6.9625,59.5959 -71.1451,-81.1467 -131.8676,12.0289 -130.1842,-18.017 10.1657,-64.6837 16.8419,-122.1183 23.9231,-122.2631 28.0798,15.5093 81.3635,55.3104 99.2986,80.6842 z"
- style="font-size:12px;fill:url(#linearGradient3745);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.177416,-0.02862587,0.153296,0.950094,43.71428,-163.8965)"
- sodipodi:ry="8.9436035"
- sodipodi:rx="28.321365"
- sodipodi:cy="804.92291"
- sodipodi:cx="511.27515"
- d="m 539.59651,804.92291 a 28.321365,8.9436035 0 0 1 -28.32136,8.94361 28.321365,8.9436035 0 0 1 -28.32137,-8.94361 28.321365,8.9436035 0 0 1 28.32137,-8.9436 28.321365,8.9436035 0 0 1 28.32136,8.9436 z"
- id="path1215"
- style="font-size:12px;fill:url(#radialGradient3747);fill-rule:evenodd"
- sodipodi:type="arc" /><path
- transform="matrix(0.306446,-0.04944456,0.07664798,0.475047,45.1489,212.2182)"
- sodipodi:nodetypes="cscccc"
- id="path1218"
- d="m 777.3699,934.7211 c -8.6272,16.4942 -7.3925,11.9995 -3.3024,2.912 5.8288,-12.7472 -16.6269,-29.9441 -28.7528,-19.7789 -25.6098,21.469 20.4682,46.9738 -4.0776,47.1574 -5.8204,-18.8965 -8.0802,-48.1143 4.2224,-58.4276 12.3026,-10.3134 29.1357,10.2558 31.9104,28.1371 z"
- style="font-size:12px;fill:url(#linearGradient3749);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.306446,-0.04944456,0.07664798,0.475047,45.1489,212.2182)"
- sodipodi:ry="64.095764"
- sodipodi:rx="52.170959"
- sodipodi:cy="812.37573"
- sodipodi:cx="657.35425"
- d="m 709.52521,812.37573 a 52.170959,64.095764 0 0 1 -52.17096,64.09577 52.170959,64.095764 0 0 1 -52.17096,-64.09577 52.170959,64.095764 0 0 1 52.17096,-64.09576 52.170959,64.095764 0 0 1 52.17096,64.09576 z"
- id="path1223"
- style="font-size:12px;fill:url(#radialGradient3751);fill-rule:evenodd"
- sodipodi:type="arc" /><path
- transform="matrix(0.627654,-0.101271,0.143375,0.888606,-9.074221,91.51868)"
- sodipodi:nodetypes="cssssssss"
- id="path1234"
- d="m 328.8677,641.1159 c 0,12.9299 4.3549,27.6324 -0.2693,36.1057 -4.6243,8.4734 -11.0126,13.7143 -18.069,13.7143 -7.0564,0 -13.4447,-5.2409 -18.069,-13.7143 -4.6242,-8.4733 -6.8831,-21.6776 -6.8831,-34.6075 0,-12.9295 10.0752,-34.3743 14.6995,-42.8476 4.6242,-8.4736 11.0126,-13.7144 18.0689,-13.7144 7.0564,0 13.4447,5.2408 18.069,13.7144 4.6242,8.4733 -7.547,28.4197 -7.547,41.3494 z"
- style="font-size:12px;fill:url(#linearGradient3753);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- id="path1359"
- d="m 201.59375,514.5625 c -14.80801,1.0624 0.69982,61.89237 4.875,78.21875 4.06915,29.6297 6.98286,43.45905 12.84375,82.84375 4.6707,31.38666 16.26403,82.46678 20.125,98 10.95964,44.09235 27.54225,102.32531 33.1875,112.8125 9.7246,17.1504 14.64278,33.42668 15.53125,48.6875 l 12.78125,0 c 0.8345,-34.30789 -14.602,-71.66266 -20.59375,-84.4375 15.13756,25.03146 56.94692,26.96731 47.625,1.46875 -8.49286,-22.81321 -45.04731,-41.33804 -62.84375,-55.28125 -17.1885,-13.8845 -31.69563,-94.26485 -35.96875,-116.6875 -11.09809,-58.35651 23.7503,-4.82375 23.46875,-23.28125 -1.04626,-31.61269 3.62064,-34.97492 -11.5625,-74.5 -6.48997,-17.37737 -11.42907,6.77313 -15.65625,-8.3125 -7.11651,-25.51494 -17.9073,-25.24203 -22.875,-37.875 -1.48703,-3.82998 -4.95315,-17.50979 -0.9375,-21.65625 z M 170.8125,927.34375 c -6.97333,0.0911 -13.64515,1.77432 -19.5,5.53125 -0.76183,0.46079 -1.02918,1.22983 -0.9375,2.25 l 50.59375,0 c -9.69507,-4.83292 -20.22442,-7.91106 -30.15625,-7.78125 z"
- style="font-size:12px;fill:url(#linearGradient3755);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.627654,-0.101271,0.143375,0.888606,-9.074221,91.51868)"
- sodipodi:nodetypes="csscscc"
- id="path1323"
- d="m 237.9271,755.611 c -5.5435,3.2916 -11.075,7.5133 -19.7942,22.7525 -6.5015,12.7213 -4.7208,46.2718 -16.3639,67.6432 -11.6431,21.3713 -35.311,9.7199 -41.8171,9.154 -18.6327,-30.9644 -12.0353,-87.2148 2.7719,-116.5718 22.1505,-43.9165 57.176,-56.647 65.5603,-80.4741 26.5348,-2.4656 20.7303,79.9846 9.643,97.4962 z"
- style="font-size:12px;fill:url(#linearGradient3757);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- id="path1321"
- d="m 366.5625,656.375 c 2.46416,17.59764 -21.94081,34.93535 -45.21875,40.40625 -16.5467,3.707 -73.10421,4.21169 -76.4375,-14.375 -8.8128,16.8304 -31.28455,39.38616 -41.96875,29.65625 -16.59,64.6835 1.4775,100.24916 9.1875,122.53125 7.2923,3.1808 18.342,4.57597 25.375,-4.96875 3.8477,-12.3369 3.71381,-34.3255 0.6875,-61.6875 8.5892,35.6425 27.70836,104.55513 31.59375,112.25 10.62763,21.3457 15.89129,39.67161 17.25,54.9375 l 78.21875,0 c 8.29485,-23.12276 14.27283,-53.23533 15.1875,-93.90625 10.3907,-8.2553 18.73881,-20.75906 31.4375,-25.59375 14.5749,-5.4367 30.15091,-0.88022 52.8125,24.9375 9.533,10.8485 26.71889,-43.82823 -89.0625,-118.09375 -1.83062,-23.65698 -4.55705,-43.2788 -9.0625,-66.09375 z M 172.625,927.1875 c -13.25806,-0.003 -21.39658,5.28944 -21.9375,6.15625 -0.3512,0.58228 -0.54115,1.16238 -0.625,1.78125 l 51.625,0 c -11.17469,-5.98811 -21.05762,-7.93566 -29.0625,-7.9375 z"
- style="font-size:12px;fill:url(#linearGradient3759);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/fish-blue.svg b/src/activities/reversecount/resource/fish-blue.svg
new file mode 100644
index 000000000..910cc248b
--- /dev/null
+++ b/src/activities/reversecount/resource/fish-blue.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg602"
+ sodipodi:version="0.32"
+ width="200"
+ height="200"
+ xml:space="preserve"
+ sodipodi:docname="fish-blue.svg"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0"
+ sodipodi:modified="true"><metadata
+ id="metadata23"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><dc:date>2019</dc:date><dc:creator><cc:Agent><dc:title>Timothée Giet</dc:title></cc:Agent></dc:creator><cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+ id="defs604" /><sodipodi:namedview
+ id="base"
+ inkscape:zoom="2.0372718"
+ inkscape:cx="97.951343"
+ inkscape:cy="95.349749"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:current-layer="layer1-1"
+ showgrid="false"
+ pagecolor="#1eb6e2"
+ inkscape:pageopacity="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false" /><g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="Layer 1"
+ transform="translate(0,0.8586273)"><g
+ transform="matrix(2.1320744,0,0,2.1320744,-5.7767728,-22.807786)"
+ inkscape:label="Calque 1"
+ id="layer1-1"><path
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.83985573px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 63.348993,30.006333 c -5.067682,0.785476 -12.29189,3.652955 -17.118789,6.980946 -4.826899,3.327991 -5.043987,11.368115 -9.844097,11.278336 -4.80011,-0.08978 -3.923488,-6.705292 -7.156973,-9.469628 C 20.786533,32.718024 -0.46031523,32.350615 3.1099802,41.608996 9.9040681,46.643658 19.596353,49.836628 20.797574,57.755591 20.103646,82.435575 -0.13741449,77.092447 4.5704082,87.610627 c 1.0761198,3.154556 12.5894598,2.48318 20.4891978,-3.308926 7.899738,-5.792105 5.201523,-13.518145 11.685586,-13.151814 6.484063,0.366331 6.324681,8.259335 10.607555,11.737109 4.282873,3.477773 8.417995,6.394854 14.312432,7.120564 C 67.559615,90.733271 76.069944,88.125135 81.0833,84.865513 92.875128,77.198612 97.319623,67.686199 96.397124,57.059386 95.135456,44.86867 86.661813,37.050063 75.591733,30.983665 70.579221,29.218361 68.416675,29.220857 63.348993,30.006333 Z"
+ id="path49949-6"
+ sodipodi:nodetypes="zzzcccczzzzsccz"
+ inkscape:connector-curvature="0" /><path
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 78.742438,34.113881 C 78.464643,29.306854 71.312238,18.063409 68.253036,18.235089 66.880565,18.312119 38.726154,30.09249 39.438805,31.969453 39.970261,33.369185 43.208114,43.677139 39.593003,47.193356 36.719687,49.98807 70.217518,31.195328 78.742438,34.113881 Z"
+ id="path4205-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssc" /><path
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 76.429463,34.579902 c -0.251238,-4.317553 -6.022572,-13.723654 -8.789307,-13.569454 -1.24126,0.06918 -26.704043,10.650026 -26.059523,12.335868 0.480646,1.257206 3.269497,8.715094 0,11.873274 -2.59862,2.510143 27.138911,-13.26106 34.84883,-10.639688 z"
+ id="path4205"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="csssc" /><path
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 59.997415,89.126888 c -2.892412,2.544393 -3.165071,7.708521 -9.348682,6.961736 L 30.559013,83.358591 c -4.06398,-3.614473 9.752901,-3.187877 12.133395,-9.149709"
+ id="path4173-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" /><path
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99748397px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 58.532842,85.773758 c -2.242267,1.972488 -3.533027,7.826253 -8.326712,7.247324 L 34.632096,83.152387 c -3.150495,-2.802047 8.640072,-3.550725 10.485488,-8.172512"
+ id="path4173"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccc" /><path
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.83985573px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 62.242687,32.280885 C 57.56157,33.006445 50.888425,35.655192 46.429724,38.729323 41.971022,41.803454 40.346133,50.084892 35.912177,50.001961 31.478221,49.91903 31.467631,45.13919 29.563254,41.701932 24.270633,32.149139 1.5794739,36.344375 5.2370117,40.861952 11.146642,47.172431 22.20508,48.91393 21.962807,57.75104 21.362852,79.634844 5.6668843,79.050611 6.810022,84.609548 7.9531597,90.168486 16.9593,87.473866 23.617943,83.53684 c 6.658642,-3.937028 8.060831,-15.156026 14.050288,-14.817638 5.989458,0.338387 5.842233,9.196106 9.798408,12.408594 3.956175,3.212488 7.775868,5.907053 13.220675,6.577407 5.444808,0.670353 12.811589,-1.376996 17.724776,-3.901305 C 88.411524,78.398643 95.451151,67.803812 94.871726,56.704014 93.224953,45.585442 83.927142,36.989685 73.551548,33.183666 68.921392,31.55302 66.923805,31.555325 62.242687,32.280885 Z"
+ id="path49949-2"
+ sodipodi:nodetypes="zzzscsczzzzcccz"
+ inkscape:connector-curvature="0" /><path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eaeef3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748397;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4222"
+ sodipodi:type="arc"
+ sodipodi:cx="86.143951"
+ sodipodi:cy="54.317295"
+ sodipodi:rx="4.7801495"
+ sodipodi:ry="7.8641162"
+ sodipodi:start="0.14344896"
+ sodipodi:end="0.14048923"
+ sodipodi:open="true"
+ d="m 90.875003,55.441529 a 4.7801495,7.8641162 0 0 1 -5.410909,6.659938 4.7801495,7.8641162 0 0 1 -4.0522,-8.896887 4.7801495,7.8641162 0 0 1 5.404912,-6.673104 4.7801495,7.8641162 0 0 1 4.060199,8.887012" /><g
+ id="g4260"
+ transform="matrix(0.99748396,0,0,0.99748396,-0.21673394,18.098622)"><path
+ sodipodi:nodetypes="ccccc"
+ id="path54402-7"
+ d="m 52.831299,11.909664 0.231634,4.416381 -6.542108,3.820918 2.372635,-5.969382 z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ sodipodi:nodetypes="ccccc"
+ id="path54404-0"
+ d="m 64.284013,7.2241726 2.9907,7.2007784 c -2.5237,0.293465 -7.104296,0.674768 -8.65198,1.155308 L 58.260718,9.7722697 Z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc"
+ id="path54408-9"
+ d="m 42.684455,67.522645 -1.483308,-1.255664 3.643043,-6.649313 c 0,0 1.393462,1.850702 3.995219,3.87615 z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc"
+ id="path54410-3"
+ d="m 50.363347,72.08288 -2.613995,-1.996434 3.537033,-5.224555 c 0,0 2.685402,2.326361 4.623345,3.3429 z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
+ sodipodi:nodetypes="cccccc"
+ id="path50840-6"
+ d="m 54.642546,19.043977 c -5.723723,13.28725 -6.281067,31.809085 -5.396156,43.066107 l 5.199252,2.638837 C 55.893887,47.684747 58.95521,33.655899 58.952291,17.556116 l -4.309752,1.487861 z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ sodipodi:nodetypes="ccccc"
+ id="path54390-0"
+ d="m 66.870433,15.60753 c -0.611634,7.921003 -7.337926,35.515477 -4.724949,52.642868 l 5.534855,-0.127258 c 3.549198,-17.698408 0.715164,-34.893271 4.171053,-52.155324 z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ sodipodi:nodetypes="ccccc"
+ id="path54392-6"
+ d="m 81.873837,19.856797 c -8.24855,16.2556 -8.363773,33.390058 -2.906349,44.995222 L 82.43413,62.434954 C 75.529554,54.680095 76.854091,29.904202 84.700906,21.788469 Z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ sodipodi:nodetypes="ccccc"
+ id="path54394-2"
+ d="m 44.212301,25.178929 c 1.61736,9.439495 2.224593,20.16 0.186056,30.411086 L 40.3838,50.096387 C 42.089675,43.259508 39.806171,38.418943 39.460501,31.474975 Z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /><path
+ sodipodi:nodetypes="ccccc"
+ id="path54396-6"
+ d="m 28.387569,24.19267 c 6.70678,10.719212 7.418831,15.393452 4.604951,27.735361 0,0 -3.038566,5.610849 -6.100646,8.910024 6.94787,-20.398454 4.209197,-27.930707 -4.649858,-41.174086 z"
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:connector-curvature="0" /></g><path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#214f8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748397;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4224-5"
+ sodipodi:type="arc"
+ sodipodi:cx="87.994347"
+ sodipodi:cy="54.076385"
+ sodipodi:rx="2.441474"
+ sodipodi:ry="4.0862565"
+ sodipodi:start="0.14344896"
+ sodipodi:end="0.14048923"
+ sodipodi:open="true"
+ d="m 90.410744,54.660546 a 2.441474,4.0862565 0 0 1 -2.763636,3.460556 2.441474,4.0862565 0 0 1 -2.069672,-4.622892 2.441474,4.0862565 0 0 1 2.760573,-3.467397 2.441474,4.0862565 0 0 1 2.073757,4.617761" /><path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1f2a38;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748397;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4224"
+ sodipodi:type="arc"
+ sodipodi:cx="87.917244"
+ sodipodi:cy="54.46188"
+ sodipodi:rx="1.7732812"
+ sodipodi:ry="2.7755704"
+ sodipodi:start="0.14344896"
+ sodipodi:end="0.14048923"
+ sodipodi:open="true"
+ d="m 89.672311,54.858668 a 1.7732812,2.7755704 0 0 1 -2.007272,2.350567 1.7732812,2.7755704 0 0 1 -1.503236,-3.140078 1.7732812,2.7755704 0 0 1 2.005048,-2.355213 1.7732812,2.7755704 0 0 1 1.506203,3.136592" /><path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748397;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4241"
+ sodipodi:type="arc"
+ sodipodi:cx="86.660812"
+ sodipodi:cy="55.949604"
+ sodipodi:rx="1.2335869"
+ sodipodi:ry="1.3877852"
+ sodipodi:start="0.14344896"
+ sodipodi:end="0.14048923"
+ sodipodi:open="true"
+ d="m 87.881729,56.147998 a 1.2335869,1.3877852 0 0 1 -1.396364,1.175283 1.2335869,1.3877852 0 0 1 -1.045729,-1.570038 1.2335869,1.3877852 0 0 1 1.394816,-1.177607 1.2335869,1.3877852 0 0 1 1.047794,1.568296" /><path
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99748397;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="path4241-3"
+ sodipodi:type="arc"
+ sodipodi:cx="86.465858"
+ sodipodi:cy="59.404415"
+ sodipodi:rx="0.57937866"
+ sodipodi:ry="0.73357695"
+ sodipodi:start="0.14344896"
+ sodipodi:end="0.14048923"
+ sodipodi:open="true"
+ d="m 87.039286,59.509285 a 0.57937866,0.73357695 0 0 1 -0.65583,0.62125 0.57937866,0.73357695 0 0 1 -0.491147,-0.829916 0.57937866,0.73357695 0 0 1 0.655103,-0.622477 0.57937866,0.73357695 0 0 1 0.492117,0.828994" /></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/ice-block.svg b/src/activities/reversecount/resource/ice-block.svg
new file mode 100644
index 000000000..133c6522f
--- /dev/null
+++ b/src/activities/reversecount/resource/ice-block.svg
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg602"
+ sodipodi:version="0.32"
+ width="400"
+ height="200"
+ xml:space="preserve"
+ sodipodi:docname="ice-block.svg"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0"
+ sodipodi:modified="true"><metadata
+ id="metadata23"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><dc:date>2019</dc:date><dc:creator><cc:Agent><dc:title>Timothée Giet</dc:title></cc:Agent></dc:creator><cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" /></cc:Work><cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/"><cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs
+ id="defs604"><linearGradient
+ inkscape:collect="always"
+ id="linearGradient924"><stop
+ style="stop-color:#eceef0;stop-opacity:0.50196081"
+ offset="0"
+ id="stop920" /><stop
+ style="stop-color:#d2e2eb;stop-opacity:1"
+ offset="1"
+ id="stop922" /></linearGradient><radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient924"
+ id="radialGradient926"
+ cx="155.57999"
+ cy="68.267921"
+ fx="155.57999"
+ fy="68.267921"
+ r="207.55693"
+ gradientTransform="matrix(1.1625507,-0.35055578,0.19321355,0.81148033,-70.679435,97.346202)"
+ gradientUnits="userSpaceOnUse" /><radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient924"
+ id="radialGradient926-6"
+ cx="203.68784"
+ cy="90.739265"
+ fx="203.68784"
+ fy="90.739265"
+ r="207.55693"
+ gradientTransform="matrix(1.3255727,0.39971355,-0.22663899,0.95186425,-73.989345,-66.205993)"
+ gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
+ id="base"
+ inkscape:zoom="1.4405687"
+ inkscape:cx="143.06372"
+ inkscape:cy="165.21253"
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:current-layer="layer3"
+ showgrid="false"
+ pagecolor="#1eb6e2"
+ inkscape:pageopacity="0"
+ inkscape:window-maximized="1" /><g
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="Layer 1"
+ transform="translate(0,0.8586273)"><path
+ style="opacity:0.5;vector-effect:none;fill:url(#radialGradient926-6);fill-opacity:1;stroke:none;stroke-width:1.90458441;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 49.285444,20.137614 H 343.26203 c 24.89174,0 44.13684,21.269981 44.93092,47.656621 l 2.41762,80.334785 c 0.7941,26.38665 -1.30264,43.57559 -26.19437,43.57559 H 37.197346 c -24.891729,0 -31.9486598,-10.37444 -31.6340102,-36.77383 L 6.7721457,53.510555 C 7.0867955,27.111162 24.393715,20.137614 49.285444,20.137614 Z"
+ id="rect916-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssssss" /><path
+ style="opacity:1;vector-effect:none;fill:url(#radialGradient926);fill-opacity:1;stroke:none;stroke-width:1.90458441;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 38.107301,11.171484 357.79616,7.0878977 c 15.90551,-1.309024 30.34293,9.0264973 32.09353,24.5091203 l 4.49308,106.886972 c 1.10873,26.37558 -12.25689,40.90229 -37.14859,40.84979 L 34.88803,178.65427 C 19.667203,176.45167 9.2773739,160.11201 9.9024753,133.71834 L 12.207699,36.384855 C 12.8328,9.9911814 13.217265,11.48942 38.107301,11.171484 Z"
+ id="rect916"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sccsscsss" /></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/iceblock.svg b/src/activities/reversecount/resource/iceblock.svg
deleted file mode 100644
index 1212486a8..000000000
--- a/src/activities/reversecount/resource/iceblock.svg
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg602"
- sodipodi:version="0.32"
- width="427.49359"
- height="199.14137"
- xml:space="preserve"
- sodipodi:docname="iceblock.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0"
- sodipodi:modified="true"><metadata
- id="metadata23"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs604"><linearGradient
- id="linearGradient618"><stop
- style="stop-color:#c5edff;stop-opacity:1;"
- offset="0"
- id="stop619" /><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="1"
- id="stop620" /></linearGradient><linearGradient
- id="linearGradient612"><stop
- style="stop-color:#e6edff;stop-opacity:0.498;"
- offset="0"
- id="stop613" /><stop
- style="stop-color:#d2ffdf;stop-opacity:0.702;"
- offset="1"
- id="stop614" /></linearGradient><linearGradient
- xlink:href="#linearGradient618"
- id="linearGradient615"
- x1="300.79311"
- y1="654.67275"
- x2="276.33324"
- y2="724.95808"
- spreadMethod="pad"
- gradientTransform="scale(1.261335,0.7928108)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient612"
- id="linearGradient616"
- gradientTransform="scale(1.7696933,0.5650697)"
- x1="75.292878"
- y1="1004.0671"
- x2="312.4985"
- y2="1004.0671"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient618"
- id="radialGradient656"
- cx="126.15959"
- cy="1157.882"
- r="31.709867"
- fx="126.15959"
- fy="1157.882"
- gradientTransform="scale(2.5512675,0.391962)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient618"
- id="radialGradient2175"
- cx="259.00865"
- cy="917.49936"
- fx="259.00865"
- fy="917.49936"
- r="90.382476"
- gradientTransform="scale(1.5802723,0.6328023)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient618"
- id="radialGradient2177"
- cx="109.32731"
- cy="1146.0134"
- fx="109.32731"
- fy="1146.0134"
- r="25.760361"
- gradientTransform="scale(2.3531015,0.424971)"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="0.36014217"
- inkscape:cx="372.04724"
- inkscape:cy="526.18109"
- inkscape:window-width="822"
- inkscape:window-height="592"
- inkscape:window-x="9"
- inkscape:window-y="75"
- inkscape:current-layer="svg602" /><g
- id="g684"
- transform="translate(-115.85232,-396.26688)"><path
- style="font-size:12px;fill:url(#linearGradient616);fill-rule:evenodd"
- d="M 133.2453,533.6385 C 138.8134,568.1605 136.62,562.4739 135.5063,583.6324 C 143.8585,590.3141 143.865,593.3442 163.2955,594.7347 L 226.5984,599.2646 L 299.3505,619.1496 L 369.7403,623.6796 L 427.1373,632.9342 C 448.5424,636.3855 470.3832,634.1955 487.475,620.8114 C 500.1921,610.1138 503.4938,606.6953 516.2652,599.6063 C 529.5743,590.9878 538.2146,563.0274 548.5987,550.0532 C 550.5906,547.5643 552.338,539.1032 553.0265,527.7227 L 547.6938,500.349 C 556.013,512.5615 547.6618,509.0265 542.7051,515.4023 L 486.9264,587.1513 C 476.8439,600.1205 449.7536,602.7728 442.7964,601.5524 L 151.1727,550.402 C 141.0158,548.6205 138.1297,543.0285 133.2453,533.6385 z "
- id="path607"
- sodipodi:nodetypes="ccscccssssccssssc"
- transform="translate(-10.63046,-38.97845)" /><g
- id="g664"
- transform="translate(-10.63046,-38.97845)"
- style="font-size:12px"><path
- transform="translate(-69.07462,-59.47551)"
- style="font-size:12px;fill:url(#radialGradient2175);fill-rule:evenodd"
- d="M 623.051,558.1809 C 623.051,573.7489 616.0319,578.171 612.6755,590.2211 C 609.319,602.2711 595.4513,608.9563 586.4786,617.2391 C 577.506,625.5219 570.7744,641.4504 556.5798,651.4798 C 532.6442,667.5575 544.3651,667.3906 500.8444,665.0282 C 473.9018,663.525 431.4688,654.7123 400.1878,657.1642 C 367.673,658.4849 315.6633,633.4947 304.7713,629.0507 C 275.7293,620.3509 249.8077,630.0337 228.4119,628.2397 C 207.0797,627.6321 195.5574,620.9954 195.5574,605.4274 C 195.5574,589.8594 212.2473,566.1697 218.3167,555.3008 C 224.3861,544.4319 238.7337,527.4853 248.2231,520.679 C 257.7125,513.8726 252.8945,504.2139 263.1544,500.8336 C 273.4145,497.4534 283.3815,495.1768 291.7785,495.0366 C 318.7469,494.5862 340.7786,498.7822 376.3413,500.0585 C 411.9038,501.3347 456.2887,520.2214 490.2135,524.5178 C 524.1383,528.8141 554.6901,527.9695 576.7606,537.0297 C 598.8312,546.09 623.051,542.6129 623.051,558.1809 z "
- id="path617"
- sodipodi:nodetypes="cssssssssssssssss" /><path
- style="font-size:12px;fill:url(#radialGradient2177);fill-opacity:0.38670002;fill-rule:evenodd"
- d="M 259.8558,470.6394 C 260.1511,475.4503 361.5308,493.4897 346.4411,501.3292 C 334.6855,506.1399 237.1858,496.0345 220.8773,493.6722 C 188.2604,493.6722 187.8048,508.782 166.5439,501.3496 C 173.6309,490.3738 209.0658,490.3737 259.8558,470.6394 z "
- id="path622"
- sodipodi:nodetypes="csccc" /><path
- style="font-size:12px;fill:url(#radialGradient656);fill-rule:evenodd"
- d="M 442.9361,470.6393 C 413.407,474.4396 399.5725,473.5922 330.7256,454.6936 C 277.2339,454.6936 200.7976,453.1786 200.7976,441.1102 C 200.7976,429.0421 251.2483,439.3385 304.74,439.3385 C 351.1446,446.4255 405.1389,463.2958 442.9361,470.6393 z "
- id="path624"
- sodipodi:nodetypes="ccccc" /><path
- style="font-size:12px;fill:url(#linearGradient615);fill-rule:evenodd"
- d="M 414.393,546.905 C 409.6119,548.9971 397.8191,599.6645 340.0392,552.1516 C 348.9812,541.4106 327.1653,516.7407 331.9463,514.6487 C 373.2278,507.9403 409.6175,518.1041 422.3048,526.6822 C 433.811,552.9779 419.174,544.813 414.393,546.905 z "
- id="path649"
- sodipodi:nodetypes="ccccc" /></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/molumen_Codfish.svg b/src/activities/reversecount/resource/molumen_Codfish.svg
deleted file mode 100644
index 3136c3ea1..000000000
--- a/src/activities/reversecount/resource/molumen_Codfish.svg
+++ /dev/null
@@ -1,619 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- viewBox="0 0 694.13503 288.01845"
- version="1.0"
- inkscape:version="0.91 r13725"
- width="100%"
- height="100%"
- sodipodi:docname="molumen_Codfish.svg">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="640"
- inkscape:window-height="480"
- id="namedview101"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="0.56982354"
- inkscape:cx="347.34154"
- inkscape:cy="137.92705"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="svg2" />
- <defs
- id="defs4">
- <linearGradient
- id="linearGradient3693">
- <stop
- id="stop3695"
- stop-color="#969aa4"
- offset="0" />
- <stop
- id="stop3697"
- stop-color="#cdcdcf"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3667">
- <stop
- id="stop3669"
- offset="0" />
- <stop
- id="stop3671"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3368">
- <stop
- id="stop3370"
- stop-color="#969aa4"
- offset="0" />
- <stop
- id="stop3372"
- stop-color="#d6d6d6"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3354">
- <stop
- id="stop3356"
- stop-color="#969aa4"
- offset="0" />
- <stop
- id="stop3358"
- stop-color="#d7d7d7"
- offset="1" />
- </linearGradient>
- <radialGradient
- id="radialGradient2214"
- gradientUnits="userSpaceOnUse"
- cy="425.06"
- cx="142.92999"
- gradientTransform="matrix(-0.30774,1.1668,-1.044,-0.27533,619.64,374.36)"
- r="11.806">
- <stop
- id="stop2210"
- stop-color="#ff0"
- offset="0" />
- <stop
- id="stop2212"
- stop-color="#fff"
- offset="1" />
- </radialGradient>
- <linearGradient
- id="linearGradient2375"
- x1="613.58002"
- gradientUnits="userSpaceOnUse"
- y1="516.10999"
- gradientTransform="translate(0,52.813)"
- x2="563.87"
- y2="516.10999">
- <stop
- id="stop3516"
- stop-opacity="0"
- offset="0" />
- <stop
- id="stop3518"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2378"
- x1="621.02002"
- gradientUnits="userSpaceOnUse"
- y1="516.33002"
- gradientTransform="translate(0,52.813)"
- x2="567.40002"
- y2="516.33002">
- <stop
- id="stop3447"
- stop-color="#969aa4"
- offset="0" />
- <stop
- id="stop3449"
- stop-color="#d5d5d5"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2381"
- x1="472.70001"
- xlink:href="#linearGradient3667"
- gradientUnits="userSpaceOnUse"
- y1="494.56"
- gradientTransform="translate(0,52.813)"
- x2="495.19"
- y2="473.42001" />
- <linearGradient
- id="linearGradient2384"
- x1="379.73001"
- xlink:href="#linearGradient3667"
- gradientUnits="userSpaceOnUse"
- y1="473.69"
- gradientTransform="translate(0,52.813)"
- x2="399.23999"
- y2="444.69" />
- <linearGradient
- id="linearGradient2387"
- x1="272.82999"
- gradientUnits="userSpaceOnUse"
- y1="445.98999"
- gradientTransform="translate(0,52.813)"
- x2="316.87"
- y2="438.13">
- <stop
- id="stop3569"
- offset="0" />
- <stop
- id="stop3571"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2390"
- x1="244.42"
- gradientUnits="userSpaceOnUse"
- y1="486.29001"
- gradientTransform="translate(0,52.813)"
- x2="659.78998"
- y2="519.60999">
- <stop
- id="stop3777"
- stop-color="#11264a"
- offset="0" />
- <stop
- id="stop3779"
- stop-color="#374c72"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2402"
- x1="253.14999"
- gradientUnits="userSpaceOnUse"
- y1="508.92001"
- gradientTransform="matrix(1.0873,0,0,1,-21.091,52.813)"
- x2="280.28"
- y2="529.81">
- <stop
- id="stop3726"
- offset="0" />
- <stop
- id="stop3728"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2405"
- x1="246.27"
- gradientUnits="userSpaceOnUse"
- y1="518.84003"
- gradientTransform="translate(0,52.813)"
- x2="316.09"
- y2="508.98001">
- <stop
- id="stop2250"
- stop-color="#a8afbb"
- offset="0" />
- <stop
- id="stop2252"
- stop-color="#e1e1e1"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2410"
- x1="144.5"
- gradientUnits="userSpaceOnUse"
- y1="503.59"
- gradientTransform="translate(0,52.813)"
- x2="817.58002"
- y2="503.06">
- <stop
- id="stop2226"
- stop-color="#243044"
- offset="0" />
- <stop
- id="stop2228"
- stop-color="#3d5f94"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2413"
- x1="278.89999"
- gradientUnits="userSpaceOnUse"
- y1="452.06"
- gradientTransform="translate(0,52.813)"
- x2="306.98001"
- y2="423.60001">
- <stop
- id="stop2308"
- stop-color="#969aa4"
- offset="0" />
- <stop
- id="stop2310"
- stop-color="#d8d8d8"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2416"
- x1="379.73001"
- xlink:href="#linearGradient3354"
- gradientUnits="userSpaceOnUse"
- y1="477.20999"
- gradientTransform="translate(0,52.813)"
- x2="410.63"
- y2="446.57999" />
- <linearGradient
- id="linearGradient2419"
- x1="471.60999"
- xlink:href="#linearGradient3368"
- gradientUnits="userSpaceOnUse"
- y1="495.37"
- gradientTransform="translate(0,52.813)"
- x2="503.04999"
- y2="474.76999" />
- <linearGradient
- id="linearGradient2422"
- x1="353.5"
- gradientUnits="userSpaceOnUse"
- y1="577.46997"
- gradientTransform="translate(0,52.813)"
- x2="350.82001"
- y2="519.71002">
- <stop
- id="stop3761"
- stop-color="#fff"
- offset="0" />
- <stop
- id="stop3763"
- stop-color="#fff"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2425"
- x1="200.94"
- gradientUnits="userSpaceOnUse"
- y1="499.04001"
- gradientTransform="translate(0,52.813)"
- x2="545.82001"
- y2="520.03003">
- <stop
- id="stop3769"
- stop-color="#5474ab"
- offset="0" />
- <stop
- id="stop3771"
- stop-color="#39527c"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient2428"
- x1="379.73001"
- xlink:href="#linearGradient3667"
- gradientUnits="userSpaceOnUse"
- y1="473.69"
- gradientTransform="matrix(1.0674,-0.0022516,-0.16393,-0.97463,45.096,1076.6)"
- x2="399.23999"
- y2="444.69" />
- <linearGradient
- id="linearGradient2431"
- x1="379.73001"
- xlink:href="#linearGradient3354"
- gradientUnits="userSpaceOnUse"
- y1="477.20999"
- gradientTransform="matrix(1.0674,-0.0022516,-0.16393,-0.97463,45.097,1076.6)"
- x2="410.63"
- y2="446.57999" />
- <linearGradient
- id="linearGradient2434"
- x1="472.70001"
- xlink:href="#linearGradient3667"
- gradientUnits="userSpaceOnUse"
- y1="494.56"
- gradientTransform="matrix(0.99904,0.064152,-0.037583,-0.86287,21.304,985.57)"
- x2="495.19"
- y2="473.42001" />
- <linearGradient
- id="linearGradient2437"
- x1="471.60999"
- xlink:href="#linearGradient3368"
- gradientUnits="userSpaceOnUse"
- y1="495.37"
- gradientTransform="matrix(0.99904,0.064152,-0.037583,-0.86287,21.304,985.57)"
- x2="503.04999"
- y2="474.76999" />
- <linearGradient
- id="linearGradient2440"
- x1="251.96001"
- xlink:href="#linearGradient3693"
- gradientUnits="userSpaceOnUse"
- y1="562.47998"
- gradientTransform="translate(0,52.813)"
- x2="277.76001"
- y2="590.94" />
- <linearGradient
- id="linearGradient2443"
- x1="251.96001"
- xlink:href="#linearGradient3693"
- gradientUnits="userSpaceOnUse"
- y1="562.47998"
- gradientTransform="translate(-4.5535,53.571)"
- x2="277.76001"
- y2="590.94" />
- <linearGradient
- id="linearGradient2446"
- x1="251.96001"
- xlink:href="#linearGradient3693"
- gradientUnits="userSpaceOnUse"
- y1="562.47998"
- gradientTransform="matrix(0.2765,0,-0.51858,0.53482,357.18,286.9)"
- x2="277.76001"
- y2="590.94" />
- </defs>
- <g
- id="layer2"
- transform="translate(-24.703462,-24.9086)">
- <g
- id="g2033"
- transform="matrix(1.3404,0,0,1.3404,-131.9,-573.58)">
- <path
- id="path3732"
- d="m 142.42,586.85 c -8.36,5.25 -11.93,11.68 -13.88,16.71 -1.63,-3.31 -0.39,-9.55 5.4,-17.45 l 8.48,0.74 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2446);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path3701"
- d="m 253.1,613.4 c 3.59,14.38 13.33,23.61 19.73,36.43 -18.24,-11.5 -27.8,-21.02 -43.26,-38.33 l 23.53,1.9 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2443);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path3691"
- d="m 259.55,612.64 c 3.59,14.38 13.33,24.37 23.91,33.77 -17.49,-6.18 -33.88,-18.36 -49.33,-35.67 l 25.42,1.9 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2440);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path3683"
- d="m 442.24,587.98 c 14.02,11.9 29.15,23.31 52.92,30.92 10.05,-7.79 22.36,-13.87 25.59,-26.11 -6.02,-4.04 -16.87,-8.39 -15.1,-11.93 -25.79,0.59 -42.86,4.52 -63.41,7.12 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2437);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path3685"
- d="m 494.77,614.59 c -16.02,-7.33 -30.3,-15.8 -42.82,-25.41 l 0.62,-0.64 c 12.45,9.56 26.63,17.99 42.57,25.3 l -0.37,0.75 z m 5.21,-4.1 c -14.6,-6.94 -28.21,-14.26 -38.64,-22.83 l 0.63,-0.58 c 10.3,8.46 23.85,15.76 38.41,22.69 l -0.4,0.72 z m 5.49,-4.06 c -13.1,-6 -25.28,-12.35 -34.22,-19.99 l 0.66,-0.61 c 8.79,7.51 20.9,13.87 33.96,19.85 l -0.4,0.75 z m 4.38,-4.39 c -10.63,-5.32 -21.15,-10.69 -28.39,-17.07 l 0.67,-0.55 c 7.06,6.23 17.53,11.58 28.16,16.89 l -0.44,0.73 z m 4.15,-4.87 c -8.79,-3.99 -15.84,-8.3 -19.7,-13.31 l 0.8,-0.41 c 3.66,4.76 10.56,9.01 19.27,12.96 l -0.37,0.76 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2434);fill-rule:evenodd" />
- <path
- id="path3675"
- d="m 319.01,619 c 16.61,16.12 34.44,31.42 59.68,41.68 24.64,-14.75 52.34,-27.09 68.87,-48.24 -9.6,-6.25 -15.54,-11.7 -20.69,-16.98 L 319.01,619 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2431);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path3677"
- d="m 378.58,655.68 c -16.69,-10.23 -32.73,-21.54 -47.6,-34.6 l 0.7,-0.64 c 14.79,13 30.76,24.25 47.4,34.45 l -0.5,0.79 z m 6.58,-3.73 C 368.59,641.57 352.5,631.03 340.21,619.2 l 0.73,-0.61 c 12.17,11.71 28.21,22.23 44.76,32.6 l -0.54,0.76 z m 6.53,-4.22 c -16.8,-10.2 -30.85,-20.42 -42.26,-30.65 l 0.69,-0.64 c 11.34,10.16 25.36,20.33 42.1,30.5 l -0.53,0.79 z m 5.75,-3.73 c -16.25,-9.68 -28.18,-19.38 -38.26,-29.07 l 0.73,-0.62 c 10.02,9.65 21.87,19.27 38.03,28.9 l -0.5,0.79 z m 6.4,-3.18 c -12.81,-8.63 -25.74,-17.26 -35.21,-28.05 l 0.8,-0.55 c 9.33,10.62 22.13,19.2 34.95,27.84 l -0.54,0.76 z m 6.53,-4.25 C 397.7,628.32 385.85,619.92 377.59,610.9 l 0.77,-0.55 c 8.12,8.87 19.9,17.23 32.55,25.46 l -0.54,0.76 z m 6.4,-3.18 c -11.79,-7.56 -22.39,-15.6 -30.6,-24.62 l 0.81,-0.55 c 8.1,8.9 18.6,16.88 30.33,24.41 l -0.54,0.76 z m 5.71,-3.97 c -11.19,-7.27 -20.89,-14.76 -26.86,-22.83 l 0.89,-0.46 c 5.82,7.86 15.38,15.29 26.51,22.52 l -0.54,0.77 z m 5.45,-3.7 c -11.14,-6.96 -19.42,-13.95 -23.66,-21.04 l 0.91,-0.36 c 4.07,6.81 12.23,13.7 23.28,20.61 l -0.53,0.79 z m 5.92,-4.28 c -8.43,-5.66 -17.13,-11.27 -20.75,-19.21 l 0.96,-0.25 c 3.43,7.52 11.92,13.06 20.37,18.73 l -0.58,0.73 z m 5.4,-5.8 c -7.67,-4.83 -14.22,-9.83 -16.7,-15.56 l 1,-0.22 c 2.29,5.31 8.64,10.23 16.24,15.02 l -0.54,0.76 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2428);fill-rule:evenodd" />
- <path
- id="path1318"
- d="m 263.31,510.78 c -6.7,0.08 -12.87,0.57 -18.4,1.53 -66.95,11.7 -94.14,25.94 -124.85,45.16 -3.18,1.99 -4.98,10.06 2.7,16.07 4.18,3.28 15.04,4.64 19.56,7.58 -6,-1.07 -12.69,-1.27 -13.84,0.18 -0.6,1.41 0.48,2.63 2.21,4.33 0,0 50.26,27.18 177.97,37.71 21.31,1.78 83.96,-12.54 132,-27.68 42.22,-13.31 79.43,-16.41 79.43,-16.41 37.9,11.16 76.33,29.72 113.69,35.06 -13.77,-26.4 -28.24,-45.27 -0.53,-90.31 -26.17,-0.57 -65.58,16.62 -112.63,32.94 -25.77,8.94 -178.17,-47.05 -257.31,-46.16 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2425);fill-rule:evenodd" />
- <path
- id="path3745"
- d="m 528.26,571.34 c -33.08,1.56 -347.87,-14.07 -366.48,8.79 -10.94,13.44 20.72,21.65 13.39,20.72 10.16,4.51 40.42,9.52 59.13,13.42 31,4.09 62.34,10.92 93.69,8.09 51.25,-6.3 99.88,-24.35 149.8,-36.41 19.32,-2.85 39.82,-11.18 58.46,-1.57 11.42,4.4 40.61,18.46 32.08,-6.17 -11.61,-9.16 -26,-7.53 -40.07,-6.87 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2422);fill-rule:evenodd" />
- <path
- id="path3366"
- d="m 439.9,546.29 c 13.56,-12.78 28.24,-24.91 51.77,-31.99 10.43,9.81 23.05,17.79 26.83,32.26 -5.86,4.24 -16.57,8.49 -14.63,12.74 -25.92,-2.62 -43.23,-8.46 -63.97,-13.01 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2419);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path3352"
- d="m 328.61,521.57 c 13.02,-16.57 27.31,-32.3 49.33,-42.88 25.4,15.07 53.29,27.66 72.1,49.33 -8,6.43 -12.71,12.03 -16.7,17.45 l -104.73,-23.9 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2416);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path2292"
- d="m 246.11,514.03 c 16.15,-23.73 38.09,-46.27 71.55,-66.4 -1.22,24.96 2.31,49.12 9.76,72.64 -34.2,-7 -59.47,-8.61 -81.31,-6.24 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2413);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path2234"
- d="m 239.07,571.81 c 7.72,0.4 54.85,-25.13 71.17,-22.31 4.85,0.83 15.33,17.07 -29.19,39.83 -3.18,1.62 -26.67,-3.01 -35.62,-3.18 -4.16,-0.08 1.72,-4.93 0.53,-7.44 -1.7,-3.59 -10.13,-7.07 -6.89,-6.9 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2405);fill-rule:evenodd;stroke:#000000;stroke-width:1.25" />
- <path
- id="path2236"
- d="m 307.61,552.31 -66.02,22.25 0.38,0.94 66.02,-22.25 -0.38,-0.94 z m -0.88,4.35 -61.87,20.59 0.34,0.94 61.9,-20.6 -0.37,-0.93 z m -4.96,7.84 -55.73,14.38 0.31,0.96 55.69,-14.37 -0.27,-0.97 z m -6.46,7.31 -49.81,9.75 0.24,1 49.78,-9.78 -0.21,-0.97 z m -7.61,7.32 -43.32,4.34 0.1,1 43.32,-4.34 -0.1,-1 z m -6.15,5.15 -37.44,1.1 0.03,0.96 37.45,-1.06 -0.04,-1 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2402);fill-rule:evenodd" />
- <path
- id="path3310"
- d="m 218.84,552.22 c -3.1,21.38 -21.52,37.79 -43.75,37.79 -1.66,0 -3.3,-0.11 -4.91,-0.29 v 1.16 c 1.61,0.17 3.25,0.28 4.91,0.28 22.85,0 41.82,-16.93 44.93,-38.94 h -1.18 z"
- inkscape:connector-curvature="0" />
- <path
- id="path3330"
- d="m 215.12,538.44 -0.84,0.9 c 14.47,4.36 27.82,11.11 23.03,21.41 -3.33,5.7 -5.77,10.77 -7.22,15.09 -12.23,13.96 -28.29,17.67 -43.87,23.44 -5.45,2.02 -14.22,0.75 -14.22,0.75 l -0.72,-0.09 v 0.9 h 0.6 l -0.07,0.44 c 0,0 8.85,1.41 14.85,-0.81 15.47,-5.73 31.89,-9.53 44.4,-23.81 l 0.06,-0.1 0.07,-0.12 c 1.44,-4.37 3.95,-9.57 7.47,-15.53 l 0.31,-0.53 -0.5,-0.32 c 3.13,-7.55 -5.04,-16.78 -23.35,-21.62 z"
- inkscape:connector-curvature="0"
- style="fill-rule:evenodd" />
- <path
- id="path3332"
- d="m 233.47,567.56 -4.22,14 c -7.72,10.18 -16.13,13.23 -25.87,18.75 -5.93,3.08 -10.11,2.68 -15.35,4 l 0.31,1.22 c 5.03,-1.26 9.45,-0.92 15.63,-4.12 v -0.03 c 9.67,-5.49 18.41,-8.64 26.34,-19.13 l 0.07,-0.09 0.03,-0.1 4.25,-14.15 -1.19,-0.35 z"
- inkscape:connector-curvature="0"
- style="fill-rule:evenodd" />
- <path
- id="path3334"
- d="m 211.31,589.63 c -3.66,4.79 -8.14,9.22 -14.34,13 l 0.62,1.06 c 6.35,-3.86 10.96,-8.42 14.69,-13.31 l -0.97,-0.75 z"
- inkscape:connector-curvature="0"
- style="fill-rule:evenodd" />
- <path
- id="path3336"
- d="m 217.65,575.56 c 0,1.2 -0.98,2.17 -2.17,2.17 -1.2,0 -2.17,-0.97 -2.17,-2.17 0,-1.2 0.97,-2.17 2.17,-2.17 1.19,0 2.17,0.97 2.17,2.17 z"
- inkscape:connector-curvature="0"
- style="fill:#405c89" />
- <path
- id="path3338"
- d="m 209.24,583.69 c 0,1.2 -0.97,2.17 -2.16,2.17 -1.2,0 -2.17,-0.97 -2.17,-2.17 0,-1.2 0.97,-2.17 2.17,-2.17 1.19,0 2.16,0.97 2.16,2.17 z"
- inkscape:connector-curvature="0"
- style="fill:#405c89" />
- <path
- id="path3340"
- d="m 199.22,589.65 c 0,1.2 -0.98,2.17 -2.17,2.17 -1.2,0 -2.17,-0.97 -2.17,-2.17 0,-1.19 0.97,-2.16 2.17,-2.16 1.19,0 2.17,0.97 2.17,2.16 z"
- inkscape:connector-curvature="0"
- style="fill:#405c89" />
- <path
- id="path3342"
- d="m 189.19,592.91 c 0,1.19 -0.97,2.16 -2.17,2.16 -1.2,0 -2.17,-0.97 -2.17,-2.16 0,-1.2 0.97,-2.17 2.17,-2.17 1.2,0 2.17,0.97 2.17,2.17 z"
- inkscape:connector-curvature="0"
- style="fill:#405c89" />
- <path
- id="path3344"
- d="m 179.43,593.99 c 0,1.2 -0.97,2.17 -2.17,2.17 -1.2,0 -2.17,-0.97 -2.17,-2.17 0,-1.2 0.97,-2.17 2.17,-2.17 1.2,0 2.17,0.97 2.17,2.17 z"
- inkscape:connector-curvature="0"
- style="fill:#405c89" />
- <path
- id="path3346"
- d="m 256.72,535.81 c -11.57,0.39 -15.2,0.37 -24.92,2.17 -2.23,0.75 -1.85,4.55 0.81,4.34 37.96,-7.03 80.93,-2.53 168.77,16.68 88.29,19.31 125.8,13.66 169.5,13.1 2.91,-0.46 1.98,-4.24 -0.03,-4.41 -44.15,0.57 -80.76,6.23 -168.54,-12.97 -66.05,-14.45 -110.89,-20.06 -145.59,-18.91 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2390);fill-rule:evenodd" />
- <path
- id="path3526"
- d="m 313.72,453.5 c -21.44,15.86 -42.39,32.68 -58.78,57.25 l 0.84,0.53 c 16.29,-24.42 37.12,-41.12 58.53,-56.97 l -0.59,-0.81 z m 0,7.94 c -18.5,14 -35.68,29.69 -50.06,48.87 l 0.81,0.63 c 14.31,-19.09 31.4,-34.72 49.84,-48.69 l -0.59,-0.81 z m 0.56,8.9 c -15.04,11.63 -29.61,23.92 -41.12,40.19 l 0.81,0.56 c 11.42,-16.14 25.91,-28.36 40.94,-39.96 l -0.63,-0.79 z m 0.81,8.91 c -12.88,8.79 -24.35,19.22 -33.62,31.66 l 0.81,0.59 c 9.2,-12.33 20.56,-22.7 33.38,-31.44 l -0.57,-0.81 z m 1.35,8.31 c -9.68,7.01 -19.19,14.99 -26.82,24.1 l 0.79,0.65 c 7.55,-9.01 16.99,-16.96 26.62,-23.93 l -0.59,-0.82 z m 1.37,7.94 c -7.94,5.27 -14.66,11.31 -20.03,17.09 l 0.72,0.69 c 5.32,-5.73 12.01,-11.72 19.88,-16.94 l -0.57,-0.84 z m 1.97,8.69 c -5.96,3.07 -9.21,6.74 -12.66,9.75 l 0.66,0.75 c 3.51,-3.06 6.66,-6.63 12.47,-9.63 l -0.47,-0.87 z m 2.34,7.15 c -2.5,1.27 -4.26,2.92 -5.71,4.13 l 0.65,0.78 c 1.49,-1.24 3.14,-2.84 5.5,-4.03 l -0.44,-0.88 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2387);fill-rule:evenodd" />
- <path
- id="path3575"
- d="m 378.62,483.81 c -14.02,10.53 -27.26,22.17 -39.12,35.6 l 0.75,0.65 c 11.81,-13.37 24.99,-24.94 38.97,-35.43 l -0.6,-0.82 z m 6.76,3.82 c -13.89,10.67 -27.29,21.52 -36.94,33.68 l 0.78,0.63 c 9.55,-12.04 22.91,-22.86 36.78,-33.53 l -0.62,-0.78 z m 6.78,4.31 c -14.14,10.5 -25.68,21.01 -34.75,31.53 l 0.75,0.66 c 9.02,-10.45 20.54,-20.92 34.62,-31.38 l -0.62,-0.81 z m 5.96,3.81 c -13.68,9.97 -23.33,19.94 -31.24,29.91 l 0.78,0.62 c 7.86,-9.91 17.45,-19.81 31.06,-29.72 l -0.6,-0.81 z m 6.5,3.25 c -10.64,8.88 -21.38,17.76 -28.56,28.84 l 0.85,0.57 c 7.06,-10.91 17.7,-19.74 28.34,-28.63 L 404.62,499 z m 6.79,4.34 c -10.57,8.49 -20.35,17.13 -26.66,26.41 l 0.81,0.56 c 6.21,-9.11 15.93,-17.71 26.47,-26.18 l -0.62,-0.79 z m 6.5,3.25 c -9.86,7.78 -18.52,16.05 -24.79,25.32 l 0.85,0.56 c 6.18,-9.14 14.76,-17.35 24.56,-25.09 l -0.62,-0.79 z m 5.97,4.07 c -9.34,7.47 -17.24,15.18 -21.57,23.47 l 0.91,0.46 c 4.21,-8.07 11.99,-15.71 21.28,-23.15 l -0.62,-0.78 z m 5.68,3.78 c -9.33,7.16 -15.99,14.34 -18.84,21.62 l 0.9,0.38 c 2.74,-7 9.31,-14.08 18.57,-21.19 l -0.63,-0.81 z m 6.22,4.37 c -7,5.82 -14.26,11.6 -16.4,19.75 l 0.93,0.25 c 2.03,-7.72 9.11,-13.42 16.13,-19.25 l -0.66,-0.75 z m 5.97,5.94 c -6.42,4.97 -11.77,10.12 -13.19,16 l 0.97,0.22 c 1.31,-5.45 6.48,-10.51 12.85,-15.44 l -0.63,-0.78 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2384);fill-rule:evenodd" />
- <path
- id="path3639"
- d="m 491.47,519.28 c -15.76,7.33 -29.73,16.11 -41.88,26.35 l 0.66,0.78 c 12.07,-10.18 25.94,-18.92 41.63,-26.22 l -0.41,-0.91 z m 5.41,5.16 c -14.36,6.98 -27.7,14.47 -37.79,23.65 l 0.66,0.72 c 9.97,-9.07 23.24,-16.53 37.56,-23.5 l -0.43,-0.87 z m 5.68,5.12 c -12.88,6 -24.83,12.48 -33.47,20.69 l 0.69,0.75 c 8.49,-8.07 20.37,-14.55 33.22,-20.53 l -0.44,-0.91 z m 4.6,5.44 c -10.44,5.38 -20.77,10.84 -27.75,17.72 l 0.68,0.69 c 6.82,-6.72 17.1,-12.15 27.53,-17.53 L 507.16,535 z m 4.37,5.97 c -8.64,3.97 -15.54,8.46 -19.19,14 l 0.82,0.53 c 3.46,-5.26 10.21,-9.69 18.78,-13.62 l -0.41,-0.91 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2381);fill-rule:evenodd" />
- <path
- id="path3439"
- d="m 631.69,523.97 c -21.34,0.09 -51.06,11.31 -86.31,24.12 2.15,0.29 4.92,1.17 8.62,2.82 9.28,4.13 19.97,12.19 22.22,15.97 1.32,2.2 0.95,4.47 -1.63,7.59 -5.14,6.22 -11.94,12.18 -20.9,16.03 26.85,9.68 53.74,20.04 80.09,23.81 -8.83,-18.98 -12.01,-66.44 -0.53,-90.31 -0.51,-0.01 -1.04,-0.03 -1.56,-0.03 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2378);fill-rule:evenodd" />
- <path
- id="path3455"
- d="m 626.22,528.19 -73.32,22.24 1.53,0.66 72.1,-21.93 -0.31,-0.97 z m -4.56,9.75 -61.44,16 1.25,0.97 60.44,-16 -0.25,-0.97 z m -4.32,10.56 -52.99,8.13 1.4,1 51.75,-8.13 -0.16,-1 z m -2.12,8.13 -45.55,3.25 0.92,1 44.72,-3.25 -0.09,-1 z m -1.06,7.59 -39.59,0.53 1.14,1.42 38.48,-0.95 -0.03,-1 z m -37.48,4.32 0.32,1.27 37.16,2.72 0.06,-1 -37.54,-2.99 z m -1.16,4.76 -0.74,1.14 40.38,7.56 0.18,-0.97 -39.82,-7.73 z m -3.49,4.23 -1.11,0.8 47.46,14.51 0.28,-0.96 -46.63,-14.35 z m -5.12,4.6 -1.01,1.1 56.54,18.55 0.31,-0.94 -55.84,-18.71 z m -6.25,4.34 -1.15,0.94 68.05,22.25 0.32,-0.97 -67.22,-22.22 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2375);fill-rule:evenodd" />
- <path
- id="path3829"
- d="m 548.52,546.92 -4.67,1.79 c 1.92,0.25 5.93,1.89 9.56,3.51 4.51,2.01 9.46,5.02 13.5,7.97 4.04,2.95 7.25,6.02 8.09,7.44 0.52,0.86 0.65,1.51 0.47,2.4 -0.18,0.89 -0.77,2.08 -1.97,3.53 -5.03,6.09 -11.66,11.89 -20.38,15.63 l -1.07,0.71 3.38,1.36 2.54,-1.38 c 7.36,-3.89 13.22,-9.06 17.72,-14.5 1.37,-1.67 2.27,-3.18 2.59,-4.75 0.32,-1.58 -0.04,-3.16 -0.84,-4.5 -1.41,-2.36 -4.66,-5.2 -8.85,-8.25 -4.18,-3.06 -9.22,-6.16 -14,-8.29 -1.62,-0.72 -3.02,-1.26 -4.34,-1.71 0.01,-0.01 -0.01,-0.03 0,-0.04 l -1.73,-0.92 z"
- inkscape:connector-curvature="0"
- style="fill-rule:evenodd" />
- <path
- id="path2216"
- d="m 263.31,510.78 c -6.7,0.08 -12.87,0.57 -18.4,1.53 -66.95,11.7 -94.14,25.94 -124.85,45.16 -1.32,0.83 -2.45,2.38 -2.75,4.66 5.04,-0.85 10.09,-2.54 15.13,-1.47 8.59,2.24 17.96,7.58 26.94,11.37 6.9,1.96 24.98,1.32 26.93,-15.94 0.97,-6.49 -1.94,-10.95 -3.4,-15.93 -0.76,-2.1 29.77,-17.37 65.25,-20.5 43.07,-3.81 41.65,1.7 107.78,13.28 65.94,11.54 93.34,23.76 156.72,28.47 18.99,1.42 35.53,-14.35 35.53,-14.35 -8.85,3.22 -18.04,6.58 -27.57,9.88 -25.77,8.94 -178.17,-47.05 -257.31,-46.16 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient2410);fill-rule:evenodd" />
- <path
- id="path1320"
- transform="matrix(1.1673,0,0,1.1673,9.606,54.577)"
- d="m 146.09,427.36 a 11.422,11.422 0 1 1 -22.84,0 11.422,11.422 0 1 1 22.84,0 z"
- inkscape:connector-curvature="0"
- style="fill:url(#radialGradient2214)" />
- <path
- id="path2195"
- d="m 165.07,545.25 c -3.03,0.2 -5.57,2.16 -6.62,4.88 l 4.54,2.27 -4.82,2.4 c 0.86,3.28 3.86,5.69 7.4,5.69 4.21,0 7.62,-3.41 7.62,-7.62 0,-4.2 -3.41,-7.62 -7.62,-7.62 -0.16,0 -0.34,-0.01 -0.5,0 z"
- inkscape:connector-curvature="0" />
- <path
- id="path3813"
- d="m 166.79,539.49 c -7.69,0 -13.93,6.24 -13.93,13.94 0,7.7 6.24,13.97 13.93,13.97 7.7,0 13.98,-6.27 13.98,-13.97 0,-7.7 -6.28,-13.94 -13.98,-13.94 z m 0,1.24 c 7.03,0 12.74,5.68 12.74,12.7 0,7.02 -5.71,12.73 -12.74,12.73 -7.02,0 -12.69,-5.71 -12.69,-12.73 0,-7.02 5.67,-12.7 12.69,-12.7 z"
- inkscape:connector-curvature="0" />
- <path
- id="path3783"
- d="m 263.31,510.28 c -6.72,0.08 -12.93,0.56 -18.5,1.53 -66.99,11.71 -94.27,25.99 -125,45.22 -1.81,1.14 -3.08,3.81 -2.97,6.97 0.12,3.16 1.66,6.85 5.6,9.94 2.23,1.75 6.03,2.88 9.84,4 2.6,0.76 4.99,1.53 7.06,2.37 -1.99,-0.24 -4.04,-0.56 -5.75,-0.56 -1.3,0 -2.47,0.1 -3.4,0.28 -0.94,0.18 -1.66,0.42 -2.1,0.97 l -0.06,0.03 -0.03,0.06 c -0.36,0.85 -0.18,1.76 0.28,2.54 0.46,0.77 1.2,1.49 2.06,2.34 l 0.04,0.06 0.06,0.03 c 0,0 12.65,6.82 41.22,14.94 28.56,8.12 73.08,17.57 136.96,22.84 10.81,0.9 31.78,-2.24 56.13,-7.5 24.35,-5.25 52.03,-12.64 76.06,-20.21 42.06,-13.26 79.08,-16.37 79.25,-16.38 37.8,11.14 76.22,29.71 113.66,35.06 l 0.97,0.13 -0.47,-0.85 c -6.9,-13.22 -14.35,-67.38 -0.53,-89.84 l 0.43,-0.72 -0.87,-0.03 c -26.4,-0.58 -65.76,16.66 -112.78,32.97 -3.07,1.06 -8.24,1.2 -15,0.53 -6.76,-0.67 -15.12,-2.14 -24.69,-4.12 C 461.65,548.9 437.7,542.79 412.09,536.41 360.88,523.64 303,509.83 263.31,510.28 z m 0,1 c 39.45,-0.44 97.32,13.33 148.53,26.1 25.61,6.38 49.55,12.51 68.72,16.5 9.59,1.99 18,3.41 24.82,4.09 6.81,0.68 12.03,0.61 15.4,-0.56 46.55,-16.15 85.61,-33.03 111.56,-32.85 -13.46,22.14 -6.19,76.28 0.54,89.07 -36.95,-5.51 -75.01,-23.77 -112.63,-34.85 l -0.09,-0.03 h -0.1 c 0,0 -37.28,3.11 -79.56,16.44 -24,7.56 -51.66,14.91 -75.97,20.15 -24.31,5.25 -45.33,8.38 -55.84,7.5 -63.83,-5.26 -108.29,-14.67 -136.78,-22.78 -28.46,-8.09 -40.91,-14.85 -40.94,-14.87 -0.01,-0.01 -0.03,0 -0.03,0 -0.8,-0.79 -1.44,-1.51 -1.78,-2.1 -0.35,-0.57 -0.41,-0.99 -0.22,-1.5 0.16,-0.17 0.64,-0.44 1.44,-0.59 0.83,-0.16 1.95,-0.25 3.21,-0.25 2.53,0 5.66,0.35 8.63,0.88 l 0.37,-0.94 c -0.04,-0.03 -0.13,-0.03 -0.18,-0.06 -2.4,-1.5 -6.13,-2.57 -9.85,-3.66 -3.8,-1.12 -7.54,-2.28 -9.5,-3.81 -3.73,-2.93 -5.11,-6.32 -5.22,-9.19 -0.1,-2.87 1.1,-5.21 2.47,-6.06 C 151,538.7 178.1,524.5 245,512.81 c 5.5,-0.96 11.63,-1.45 18.31,-1.53 z"
- inkscape:connector-curvature="0"
- style="fill-rule:evenodd" />
- <path
- id="path2462"
- d="m 118.28,567.47 c 0.1,0.43 0.45,1.27 1.03,2.41 0.01,0.01 0.02,0.04 0.03,0.06 0.02,0.02 0.02,0.04 0.04,0.06 0.82,1.22 1.93,2.4 3.37,3.53 3.62,2.84 12.25,4.27 17.44,6.5 v 0.75 c -5.36,-0.75 -10.7,-0.75 -11.72,0.53 -0.13,0.31 -0.18,0.61 -0.16,0.91 0,0.02 0.7,1.74 0.7,1.76 1.93,1.97 3.36,2.09 5.68,3.55 0.01,0.01 0.02,0.03 0.03,0.03 0,0.01 0.02,0 0.03,0 0.02,0.01 0.04,0.05 0.06,0.06 4.05,-2.37 12.98,-0.98 21.75,0.29 7.57,1.6 6.84,-9.72 1.82,-10.13 -1.36,-0.11 -38.3,-9.23 -40.07,-10.31 0,-0.01 -0.02,0 -0.03,0 z"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:1px" />
- <path
- id="path2464"
- d="m 135.79,572.27 c 0,0 11.97,4.46 18.18,7.18 6.21,2.72 7.75,5.97 7.75,5.97"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:0.95976001px" />
- </g>
- </g>
- <metadata
- id="metadata99">
- <rdf:RDF>
- <cc:Work>
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:publisher>
- <cc:Agent
- rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:title>Codfish</dc:title>
- <dc:date>2006-11-08T05:12:10</dc:date>
- <dc:description>codfish</dc:description>
- <dc:source>http://openclipart.org/detail/1335/codfish-by-molumen</dc:source>
- <dc:creator>
- <cc:Agent>
- <dc:title>molumen</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>animal</rdf:li>
- <rdf:li>blue</rdf:li>
- <rdf:li>clip art</rdf:li>
- <rdf:li>clipart</rdf:li>
- <rdf:li>cod</rdf:li>
- <rdf:li>codfish</rdf:li>
- <rdf:li>eye</rdf:li>
- <rdf:li>fish</rdf:li>
- <rdf:li>food</rdf:li>
- <rdf:li>how i did it</rdf:li>
- <rdf:li>image</rdf:li>
- <rdf:li>media</rdf:li>
- <rdf:li>png</rdf:li>
- <rdf:li>profile</rdf:li>
- <rdf:li>public domain</rdf:li>
- <rdf:li>sea</rdf:li>
- <rdf:li>svg</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/src/activities/reversecount/resource/morse.svg b/src/activities/reversecount/resource/morse.svg
deleted file mode 100644
index a1e08250d..000000000
--- a/src/activities/reversecount/resource/morse.svg
+++ /dev/null
@@ -1,717 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg602"
- sodipodi:version="0.32"
- width="329.55731"
- height="247.21071"
- xml:space="preserve"
- sodipodi:docname="morse.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.0"><metadata
- id="metadata103"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs604"><linearGradient
- id="linearGradient908"><stop
- style="stop-color:#00b8c5;stop-opacity:0.2471;"
- offset="0"
- id="stop909" /><stop
- style="stop-color:#00a3b0;stop-opacity:0.7725;"
- offset="1"
- id="stop910" /></linearGradient><linearGradient
- id="linearGradient841"><stop
- style="stop-color:#e5edff;stop-opacity:0.498;"
- offset="0"
- id="stop842" /><stop
- style="stop-color:#d2ffde;stop-opacity:0.698;"
- offset="1"
- id="stop843" /></linearGradient><linearGradient
- id="linearGradient825"><stop
- style="stop-color:#d2edf7;stop-opacity:1;"
- offset="0"
- id="stop826" /><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="1"
- id="stop827" /></linearGradient><linearGradient
- id="linearGradient755"><stop
- style="stop-color:#d2d7da;stop-opacity:1;"
- offset="0"
- id="stop756" /><stop
- style="stop-color:#9a92a3;stop-opacity:1;"
- offset="1"
- id="stop757" /></linearGradient><linearGradient
- id="linearGradient725"><stop
- style="stop-color:#75552d;stop-opacity:0.1529;"
- offset="0"
- id="stop726" /><stop
- style="stop-color:#878d75;stop-opacity:0.6667;"
- offset="1"
- id="stop727" /></linearGradient><linearGradient
- id="linearGradient627"><stop
- style="stop-color:#ffedc2;stop-opacity:1;"
- offset="0"
- id="stop628" /><stop
- style="stop-color:#ddcab0;stop-opacity:1;"
- offset="1"
- id="stop629" /></linearGradient><linearGradient
- id="linearGradient621"><stop
- style="stop-color:#f8f8f8;stop-opacity:1;"
- offset="0"
- id="stop622" /><stop
- style="stop-color:#252726;stop-opacity:1;"
- offset="1"
- id="stop623" /></linearGradient><linearGradient
- id="linearGradient616"><stop
- style="stop-color:#75552d;stop-opacity:1;"
- offset="0"
- id="stop617" /><stop
- style="stop-color:#878d75;stop-opacity:1;"
- offset="1"
- id="stop618" /></linearGradient><linearGradient
- id="linearGradient611"><stop
- style="stop-color:#000;stop-opacity:1;"
- offset="0"
- id="stop612" /><stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop613" /></linearGradient><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient616"
- id="radialGradient2306"
- cx="120.07292"
- cy="537.82007"
- fx="120.07292"
- fy="537.82007"
- r="336.71631"
- gradientTransform="scale(0.8316227,1.2024684)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient725"
- id="radialGradient2308"
- cx="83.181931"
- cy="1178.7916"
- fx="83.181931"
- fy="1178.7916"
- r="73.004311"
- gradientTransform="scale(2.0357829,0.4912115)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient725"
- id="radialGradient2310"
- cx="73.222427"
- cy="1311.6519"
- fx="73.222427"
- fy="1311.6519"
- r="75.718994"
- gradientTransform="scale(2.1904381,0.4565297)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient725"
- id="radialGradient2312"
- cx="71.771774"
- cy="1268.0686"
- fx="71.771774"
- fy="1268.0686"
- r="89.857124"
- gradientTransform="scale(2.0651518,0.4842259)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2314"
- spreadMethod="reflect"
- x1="82.170937"
- y1="664.48535"
- x2="82.471199"
- y2="704.17383"
- gradientTransform="scale(1.6880719,0.5923918)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2316"
- spreadMethod="reflect"
- x1="268.30682"
- y1="372.68872"
- x2="266.76575"
- y2="379.06595"
- gradientTransform="scale(0.9079967,1.1013256)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="radialGradient2318"
- cx="166.32921"
- cy="290.09601"
- fx="166.32921"
- fy="290.09601"
- r="10.181284"
- gradientTransform="scale(0.6948075,1.4392476)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2320"
- spreadMethod="repeat"
- x1="73.393585"
- y1="658.5506"
- x2="80.472069"
- y2="660.59143"
- gradientTransform="scale(1.687309,0.5926597)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2322"
- gradientTransform="scale(0.7874417,1.2699353)"
- spreadMethod="reflect"
- x1="223.47304"
- y1="345.61493"
- x2="232.68439"
- y2="346.22394"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="radialGradient2324"
- gradientTransform="scale(0.4794138,2.0858806)"
- cx="265.53275"
- cy="200.60283"
- fx="265.53275"
- fy="200.60283"
- r="8.2388058"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2326"
- spreadMethod="reflect"
- x1="116.21538"
- y1="506.83673"
- x2="121.52427"
- y2="502.77359"
- gradientTransform="scale(1.1399771,0.8772106)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient627"
- id="linearGradient2328"
- x1="952.38312"
- y1="457.76361"
- x2="1053.8257"
- y2="461.80579"
- gradientTransform="scale(0.5036879,1.9853562)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient627"
- id="linearGradient2330"
- x1="549.10144"
- y1="458.95081"
- x2="652.01013"
- y2="463.05139"
- gradientTransform="scale(0.5060602,1.9760497)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="radialGradient2332"
- cx="314.56259"
- cy="623.89001"
- fx="314.56259"
- fy="623.89001"
- r="17.158766"
- gradientTransform="scale(1.0235328,0.9770083)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="radialGradient2334"
- cx="314.56259"
- cy="623.89001"
- fx="314.56259"
- fy="623.89001"
- r="17.158766"
- gradientTransform="scale(1.0235328,0.9770083)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient616"
- id="radialGradient2336"
- cx="217.9684"
- cy="992.66241"
- fx="217.9684"
- fy="992.66241"
- r="195.20511"
- gradientTransform="scale(1.4752437,0.6778541)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient616"
- id="linearGradient2338"
- x1="349.8714"
- y1="826.0166"
- x2="315.74777"
- y2="837.66864"
- gradientTransform="scale(1.22499,0.8163332)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient616"
- id="linearGradient2340"
- x1="189.3167"
- y1="414.11252"
- x2="160.44472"
- y2="513.36053"
- gradientTransform="scale(0.6585867,1.5184029)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="radialGradient2342"
- gradientTransform="scale(1.5369267,0.6506491)"
- cx="187.86536"
- cy="815.34888"
- fx="187.86536"
- fy="815.34888"
- r="10.689518"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="radialGradient2344"
- gradientTransform="scale(1.5369267,0.6506491)"
- cx="187.86542"
- cy="815.34888"
- fx="187.86542"
- fy="815.34888"
- r="10.689495"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient908"
- id="linearGradient2346"
- x1="229.38393"
- y1="792.90564"
- x2="220.41081"
- y2="1192.7797"
- gradientTransform="scale(1.0919392,0.9158019)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient841"
- id="linearGradient2348"
- spreadMethod="reflect"
- x1="272.69962"
- y1="995.17505"
- x2="222.55145"
- y2="1001.1023"
- gradientTransform="scale(1.7696933,0.5650697)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2350"
- cx="434.29053"
- cy="1010.0573"
- fx="434.29053"
- fy="1010.0573"
- r="154.97861"
- gradientTransform="scale(1.5789719,0.6333235)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2352"
- cx="244.48337"
- cy="915.24231"
- fx="244.48337"
- fy="915.24231"
- r="154.85106"
- gradientTransform="scale(1.5802723,0.6328023)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2354"
- cx="105.18739"
- cy="1145.3701"
- fx="105.18739"
- fy="1145.3701"
- r="44.134876"
- gradientTransform="scale(2.3531015,0.424971)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2356"
- cx="121.06353"
- cy="1157.0901"
- fx="121.06353"
- fy="1157.0901"
- r="54.328083"
- gradientTransform="scale(2.5512675,0.391962)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2358"
- cx="296.36359"
- cy="683.57147"
- fx="296.36359"
- fy="683.57147"
- r="43.278053"
- gradientTransform="scale(1.261335,0.7928108)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient616"
- id="radialGradient2360"
- spreadMethod="pad"
- cx="282.40872"
- cy="929.35553"
- fx="282.40872"
- fy="929.35553"
- r="49.379955"
- gradientTransform="scale(1.4138056,0.7073108)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2362"
- spreadMethod="reflect"
- x1="82.170937"
- y1="664.48535"
- x2="82.471199"
- y2="704.17383"
- gradientTransform="scale(1.6880719,0.5923918)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2364"
- spreadMethod="reflect"
- x1="268.30682"
- y1="372.68872"
- x2="266.76575"
- y2="379.06595"
- gradientTransform="scale(0.9079967,1.1013256)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="radialGradient2366"
- cx="166.32921"
- cy="290.09601"
- fx="166.32921"
- fy="290.09601"
- r="10.181284"
- gradientTransform="scale(0.6948075,1.4392476)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2368"
- spreadMethod="repeat"
- x1="73.393585"
- y1="658.5506"
- x2="80.472069"
- y2="660.59143"
- gradientTransform="scale(1.687309,0.5926597)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2370"
- gradientTransform="scale(0.7874417,1.2699353)"
- spreadMethod="reflect"
- x1="223.47304"
- y1="345.61493"
- x2="232.68439"
- y2="346.22394"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="radialGradient2372"
- gradientTransform="scale(0.4794138,2.0858806)"
- cx="265.53275"
- cy="200.60283"
- fx="265.53275"
- fy="200.60283"
- r="8.2388058"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2374"
- spreadMethod="reflect"
- x1="116.21538"
- y1="506.83673"
- x2="121.52427"
- y2="502.77359"
- gradientTransform="scale(1.1399771,0.8772106)"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="0.36014217"
- inkscape:cx="201.59483"
- inkscape:cy="390.04839"
- inkscape:window-width="822"
- inkscape:window-height="592"
- inkscape:window-x="6"
- inkscape:window-y="50"
- inkscape:current-layer="g2255"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="0" /><g
- id="g2255"
- transform="matrix(0.8,0,0,0.8,-119.23533,-388.7061)"><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="csscsssscscsscsscscsc"
- id="path712"
- d="m 387.4215,720.4553 c 0,66.2124 -23.8104,127.3264 -50.9564,170.7173 -13.573,21.6955 158.8461,-15.1081 62.3008,67.7664 -79.2602,67.198 -138.3003,-24.4482 -159.012,-24.4482 -20.7118,0 -7.6824,114.9732 -169.54236,31.4684 -19.22272,-9.9894 117.99826,-66.779 109.10186,-78.2967 -31.0321,-42.8605 -79.037,-96.3147 -84.88714,-166.0371 -3.31659,-32.9395 12.02004,-64.6187 26.66624,-96.7028 3.3903,-8.7206 12.8309,-22.771 17.9357,-22.7938 -0.6768,-4.2186 0.3866,-8.3992 2.5706,-11.9489 2.184,-3.5497 6.0793,-7.6494 8.7038,-7.5722 -1.6938,-2.6391 1.0252,-10.4332 2.8508,-13.8112 1.8256,-3.378 12.5099,-20.5806 14.2143,-26.7473 12.9722,-47.525 28.032,-66.0946 60.5968,-66.0946 41.4235,0 55.3022,24.4755 75.3612,67.8664 2.937,5.6838 16.1342,22.4816 18.2576,25.7401 2.1234,3.2585 4.9108,8.942 3.023,11.731 4.0181,0.4266 6.1547,-0.1701 8.0618,5.6289 2.491,3.9831 17.9526,19.339 4.633,18.8744 5.0518,0.8706 6.9087,2.0686 7.5306,3.3833 13.3172,32.5841 42.5898,78.1705 42.5898,111.2766 z"
- style="font-size:12px;fill:url(#radialGradient2306);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="csccccc"
- id="path715"
- d="m 324.5248,580.9302 c -38.9784,7.4178 -48.5253,21.7854 -100.5304,22.2474 -39.2215,0.939 -44.7312,-13.8316 -73.6913,-20.9186 -1.9626,-4.8723 5.02,-21.1896 9.4493,-21.261 27.1668,13.512 43.6599,30.1197 64.3734,30.1197 21.2826,0 59.1536,-19.6546 89.7847,-29.1867 4.9457,2.1126 12.9766,14.5341 10.6143,18.9992 z"
- style="font-size:12px;fill:url(#radialGradient2308);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="csccccc"
- id="path717"
- d="m 333.3583,594.5861 c -43.8459,7.4177 -49.8881,27.0282 -108.3874,27.4901 -44.1193,0.9391 -53.2699,-13.2409 -85.8464,-20.3279 -2.2077,-4.8723 6.2374,-20.5991 11.8105,-19.4893 30.5592,13.512 50.8836,21.261 74.1837,21.261 23.9404,0 65.3593,-12.5677 99.8155,-22.0998 5.5633,2.1126 11.0814,8.7008 8.4241,13.1659 z"
- style="font-size:12px;fill:url(#radialGradient2310);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="csccccc"
- id="path718"
- d="m 341.617,605.2945 c -48.8164,7.4178 -53.1679,37.5807 -118.2988,38.0427 -49.1209,0.939 -62.6781,-15.6033 -98.9475,-22.6903 -2.4579,-4.8724 8.8097,-18.2367 14.3569,-18.3081 34.0236,13.512 61.7665,22.4421 87.708,22.4421 26.6543,0 68.7908,-23.1034 107.153,-32.6355 6.194,2.1127 10.9869,8.684 8.0284,13.1491 z"
- style="font-size:12px;fill:url(#radialGradient2312);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- style="font-size:12px"
- transform="matrix(0.409515,-0.07501128,0.112982,0.426618,200.827,372.6231)"
- id="g762"><path
- sodipodi:nodetypes="csccccc"
- id="path729"
- d="m 222.8887,433.7143 c -25.448,-3.535 -53.3547,-0.2926 -95.3565,5.5575 -20.8718,2.3256 -36.68789,4.8014 -46.25184,3.5567 -4.78197,-0.6224 -7.8995,-2.2287 -9.50728,-5.1415 22.47906,6.9787 28.82782,-1.4969 0.76816,-13.6254 16.54657,-20.1492 26.22623,-33.9305 54.99096,-33.9305 23.2815,0 57.0383,9.9703 95.3565,43.5832 z"
- style="font-size:12px;fill:url(#linearGradient2314);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccccc"
- id="path731"
- d="m 230.9704,435.9243 c -4.6075,16.1567 18.7059,38.1846 -0.4607,32.7187 -19.1666,-5.4659 -30.1038,-20.5459 -25.4963,-36.7026 8.6398,0.1058 10.9475,-0.0693 16.8865,1.1368 -6.5929,-5.7167 -8.1833,-6.7366 -13.3909,-10.758 1.9454,-8.3168 29.1026,-14.9176 38.6859,-12.1847 19.1665,5.4658 -11.617,9.6333 -16.2245,25.7898 z"
- style="font-size:12px;fill:url(#linearGradient2316);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:ry="8.482666"
- sodipodi:rx="4.0950699"
- sodipodi:cy="417.91852"
- sodipodi:cx="115.83204"
- d="m 119.92711,417.91852 a 4.0950699,8.482666 0 0 1 -4.09507,8.48266 4.0950699,8.482666 0 0 1 -4.09507,-8.48266 4.0950699,8.482666 0 0 1 4.09507,-8.48267 4.0950699,8.482666 0 0 1 4.09507,8.48267 z"
- id="path733"
- style="fill:url(#radialGradient2318);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- sodipodi:nodetypes="ccccc"
- id="path737"
- d="m 163.8029,392.1781 c -2.925,6.8413 -4.4345,4.3875 -9.6526,3.2174 -13.9934,-2.9249 -28.3731,-2.2262 -35.9783,-3.2174 0,-2.7463 7.3596,-8.4827 16.0879,-11.4077 13.4083,0 29.543,8.6614 29.543,11.4077 z"
- style="font-size:12px;fill:url(#linearGradient2320);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccsc"
- id="path738"
- d="m 185.4483,440.1489 c 0,5.6541 -2.7502,10.2377 -6.1426,10.2377 -3.3925,0 -6.1426,-4.5836 -6.1426,-10.2377 0,-5.6541 1.7869,-10.9019 5.4784,-9.2744 2.863,1.8196 6.8068,3.6203 6.8068,9.2744 z"
- style="font-size:12px;fill:url(#linearGradient2322);fill-rule:evenodd;stroke-width:1"
- transform="matrix(0.823214,-0.567732,0.567732,0.823214,-216.4326,176.6848)"
- inkscape:connector-curvature="0" /><path
- transform="matrix(1.314235,0.08969686,-0.11836,0.995969,5.893703,-8.555023)"
- sodipodi:nodetypes="ccccc"
- id="path740"
- d="m 133.3823,416.456 c 0,8.0773 -3.9421,14.0403 -5.85,16.3803 -1.6155,0 3.51,-8.303 3.51,-16.3803 0,-8.0773 -5.7105,-12.8703 -4.095,-12.8703 3.6629,0.585 6.435,4.793 6.435,12.8703 z"
- style="font-size:12px;fill:url(#radialGradient2324);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccsc"
- id="path751"
- d="m 141.9884,438.7913 c 4.9369,4.3821 6.6013,8.9745 4.0781,12.0612 -2.5232,3.0869 -8.5709,2.0366 -13.5078,-2.3456 -4.937,-4.3821 -9.4777,-12.4402 -4.0235,-12.1728 5.8803,0.3046 9.1013,0.7076 13.4532,2.4572 z"
- style="font-size:12px;fill:url(#linearGradient2326);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path754"
- d="m 91.26164,437.5162 c -1.75503,4.6848 -10.08432,3.2175 -18.86659,0.2925 -0.29964,-2.9251 6.87387,0.005 6.87387,-4.68 0,-2.3449 -4.83346,-4.3877 -6.28886,-9.3603 11.41481,5.8501 19.45161,11.403 18.28158,13.7478 z"
- style="font-size:12px;fill:#ab8080;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><g
- style="font-size:12px"
- transform="matrix(0.175903,0,0,0.127121,216.9315,437.8923)"
- id="g687"><path
- sodipodi:nodetypes="cccc"
- id="path630"
- d="m 464.3757,786.7656 c 26.7266,130.6534 -7.282,299.0054 10.0225,315.7094 23.9862,23.386 63.4758,-213.4533 76.8391,-340.7656 -25.0563,24.6974 -63.4759,36.3898 -86.8616,25.0562 z"
- style="font-size:12px;fill:url(#linearGradient2328);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path626"
- d="m 350.7874,786.7656 c -26.7266,130.653 7.282,299.0054 -10.0225,315.7094 -23.9862,23.386 -65.1462,-216.7945 -78.5095,-344.1065 28.3971,31.3788 60.135,38.0599 88.532,28.3971 z"
- style="font-size:12px;fill:url(#linearGradient2330);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g><g
- style="font-size:12px"
- transform="matrix(0.138668,0,0,0.110454,230.5151,450.8075)"
- id="g645"><path
- sodipodi:ry="75.168732"
- sodipodi:rx="65.14624"
- sodipodi:cy="559.58936"
- sodipodi:cx="319.0495"
- d="m 384.19574,559.58936 a 65.14624,75.168732 0 0 1 -65.14624,75.16873 65.14624,75.168732 0 0 1 -65.14624,-75.16873 65.14624,75.168732 0 0 1 65.14624,-75.16874 65.14624,75.168732 0 0 1 65.14624,75.16874 z"
- id="path608"
- style="fill:#f8f8f8;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="translate(183.7458,-3.051758e-5)"
- sodipodi:ry="75.168732"
- sodipodi:rx="65.14624"
- sodipodi:cy="559.58936"
- sodipodi:cx="319.0495"
- d="m 384.19574,559.58936 a 65.14624,75.168732 0 0 1 -65.14624,75.16873 65.14624,75.168732 0 0 1 -65.14624,-75.16873 65.14624,75.168732 0 0 1 65.14624,-75.16874 65.14624,75.168732 0 0 1 65.14624,75.16874 z"
- id="path610"
- style="fill:#f8f8f8;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="matrix(1.181818,0,0,1.190476,-66.81661,-120.9065)"
- sodipodi:ry="35.078735"
- sodipodi:rx="36.749161"
- sodipodi:cy="599.67938"
- sodipodi:cx="330.74243"
- d="m 367.49159,599.67938 a 36.749161,35.078735 0 0 1 -36.74916,35.07874 36.749161,35.078735 0 0 1 -36.74916,-35.07874 36.749161,35.078735 0 0 1 36.74916,-35.07873 36.749161,35.078735 0 0 1 36.74916,35.07873 z"
- id="path619"
- style="fill:url(#radialGradient2332);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="matrix(1.181818,0,0,1.190476,113.5883,-120.9065)"
- sodipodi:ry="35.078735"
- sodipodi:rx="36.749161"
- sodipodi:cy="599.67938"
- sodipodi:cx="330.74243"
- d="m 367.49159,599.67938 a 36.749161,35.078735 0 0 1 -36.74916,35.07874 36.749161,35.078735 0 0 1 -36.74916,-35.07874 36.749161,35.078735 0 0 1 36.74916,-35.07873 36.749161,35.078735 0 0 1 36.74916,35.07873 z"
- id="path624"
- style="fill:url(#radialGradient2334);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /></g><path
- transform="matrix(0.175903,0,0,0.127121,216.9315,437.8923)"
- sodipodi:nodetypes="ccsss"
- id="path607"
- d="m 584.6457,709.9269 c 0,67.3458 -153.5697,135.3038 -180.405,21.7154 -30.1761,113.5884 -170.3824,45.6304 -170.3824,-21.7154 0,-67.3458 93.4467,-79.8413 167.0416,-78.5096 80.1786,1.5113 183.7458,11.1638 183.7458,78.5096 z"
- style="font-size:12px;fill:url(#radialGradient2336);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="cccsc"
- id="path772"
- d="m 449.7839,672.4411 c -23.1652,6.9428 -32.1256,-6.6188 -84.3877,6.6185 -5.9316,-29.7838 -40.598,-49.4819 -26.4747,-76.1143 17.4328,1.7318 57.6233,0.6161 85.8417,20.2573 16.9448,11.1412 25.0207,10.8569 25.0207,49.2385 z"
- style="font-size:12px;fill:url(#linearGradient2338);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="ccccc"
- id="path1031"
- d="m 159.1239,748.7398 c 0,55.8953 -49.1222,49.7263 -67.86172,49.7263 -18.73939,0 1.17006,-121.3641 29.25072,-172.5793 4.6801,-13.7744 7.0012,32.1758 25.7406,32.1758 18.7395,0 12.8704,34.7819 12.8704,90.6772 z"
- style="font-size:12px;fill:url(#linearGradient2340);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
- id="path963"
- d="m 262.2182,534.5087 c -0.8516,1.375 -1.3647,3.2019 -0.8859,4.9334 m 2.0671,-4.2817 c -0.9038,1.2706 -1.2513,2.6278 -0.8859,4.7246 m 2.0059,-4.0386 c -1.0604,1.114 -1.0425,3.0976 -0.6771,4.7768 m 1.7628,-4.2906 c -1.0604,1.1139 -0.8859,3.4108 -0.6249,4.8812 m 1.7106,-4.3339 c -0.8516,1.4272 -0.9903,3.0453 -0.6771,4.7246 m 1.8583,-4.2295 c -0.8516,1.4272 -0.9381,3.1498 -0.7815,4.7246 m 2.0581,-4.3338 c -0.695,1.4795 -1.0425,3.2542 -0.7293,4.7768 m 2.0059,-4.4293 c -0.5906,1.4272 -0.9903,3.1498 -0.6771,4.7246 m 2.0581,-4.4293 c -0.5906,1.4272 -0.9381,3.202 -0.6249,4.7246 m 2.006,-4.577 c -0.5906,1.4272 -0.8859,3.1498 -0.6771,4.7246 m 2.0058,-4.5769 c -0.5906,1.4272 -0.6249,3.0976 -0.6249,4.6724 m 2.1014,-4.6724 c -0.5906,1.4272 -0.6249,3.1498 -0.6249,4.7246 m 2.1014,-4.8723 c -0.5906,1.4272 -0.5727,3.0975 -0.5727,4.6724 m 2.0491,-4.82 c -0.4862,1.4794 -0.6771,3.1497 -0.5205,4.6202 m 1.7971,-4.8545 c -0.434,1.5837 -0.5727,3.0454 -0.5727,4.6202"
- style="font-size:12px;fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccccccccccccccccccccccccccccc"
- id="path964"
- d="m 314.8576,534.5087 c 0.8516,1.375 1.3647,3.2019 0.8859,4.9334 m -2.0671,-4.2817 c 0.9038,1.2706 1.2513,2.6278 0.8859,4.7246 m -2.0059,-4.0386 c 1.0604,1.114 1.0425,3.0976 0.6771,4.7768 m -1.7628,-4.2906 c 1.0604,1.1139 0.8859,3.4108 0.6249,4.8812 m -1.7106,-4.3339 c 0.8516,1.4272 0.9903,3.0453 0.6771,4.7246 m -1.8583,-4.2295 c 0.8516,1.4272 0.9381,3.1498 0.7815,4.7246 m -2.0581,-4.3338 c 0.695,1.4795 1.0425,3.2542 0.7293,4.7768 m -2.0059,-4.4293 c 0.5906,1.4272 0.9903,3.1498 0.6771,4.7246 m -2.0581,-4.4293 c 0.5906,1.4272 0.9381,3.202 0.6249,4.7246 m -2.006,-4.577 c 0.5906,1.4272 0.8859,3.1498 0.6771,4.7246 m -2.0058,-4.5769 c 0.5906,1.4272 0.6249,3.0976 0.6249,4.6724 m -2.1014,-4.6724 c 0.5906,1.4272 0.6249,3.1498 0.6249,4.7246 m -2.1014,-4.8723 c 0.5906,1.4272 0.5727,3.0975 0.5727,4.6724 m -2.0491,-4.82 c 0.4862,1.4794 0.6771,3.1497 0.5205,4.6202 m -1.7971,-4.8545 c 0.434,1.5837 0.5727,3.0454 0.5727,4.6202"
- style="font-size:12px;fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path966"
- d="m 296.291,529.4159 c 0,0.6342 -1.3555,1.1484 -3.0276,1.1484 -1.6722,0 -3.6541,0.9475 -3.6541,0.3132 0,-0.6343 1.9819,-2.61 3.6541,-2.61 1.6721,0 3.0276,0.5141 3.0276,1.1484 z"
- style="font-size:12px;fill:url(#radialGradient2342);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path967"
- d="m 281.466,529.2071 c 0,0.6342 1.3555,1.1484 3.0276,1.1484 1.6722,0 3.6541,0.9475 3.6541,0.3132 0,-0.6343 -1.9819,-2.61 -3.6541,-2.61 -1.6721,0 -3.0276,0.5141 -3.0276,1.1484 z"
- style="font-size:12px;fill:url(#radialGradient2344);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- id="path1107"
- d="m 268.2396,531.5658 c -1.8617,-0.7003 -4.4999,-0.6784 -5.8097,-0.3203 m 5.3087,-1.4582 c -2.2746,-0.7731 -4.6604,-1.1235 -6.434,-0.6428 m 6.5253,-1.2207 c -1.4592,-0.7037 -4.4268,-0.9924 -6.2125,-1.1721 m 7.5009,-0.1099 c -1.1022,-0.6874 -3.6699,-1.383 -5.3737,-1.5428 m 45.741,6.4775 c 1.8617,-0.7003 4.4999,-0.6784 5.8097,-0.3203 m -5.3087,-1.4582 c 2.2746,-0.7731 4.6604,-1.1235 6.434,-0.6428 m -6.5253,-1.2207 c 1.4592,-0.7037 4.4268,-0.9924 6.2125,-1.1721 m -7.5009,-0.1099 c 1.1022,-0.6874 3.6699,-1.383 5.3737,-1.5428"
- style="font-size:12px;fill:none;stroke:#000000;stroke-width:0.25;stroke-linecap:round"
- inkscape:connector-curvature="0" /><g
- id="g2128"><path
- transform="matrix(0.713434,0,0,0.593331,120.3374,197.2361)"
- sodipodi:nodetypes="cssscscccsccc"
- id="path886"
- d="m 388.7641,704.8819 c 18.9126,47.0498 -13.9595,149.7957 -45.375,196.5121 -10.9938,18.0881 86.4824,-2.5136 90.985,27.3324 5.6231,29.5182 -67.409,71.2503 -91.9118,66.0137 -53.9624,-12.1109 -52.0376,-25.924 -95.6327,-52.4918 -15.6908,7.0201 -10.8033,64.6277 -66.8744,65.0377 -62.7723,0.44 -76.6065,-13.805 -105.70258,-33.4269 -4.31803,-7.1126 86.65868,-50.3877 115.20788,-73.3811 -16.1461,-21.4419 -48.4358,-60.3544 -63.4341,-91.9639 -8.9116,0.3753 -26.90561,3.5462 -32.43389,-1.8741 -8.47159,-10.099 4.91914,-66.2326 6.08917,-88.521 1.13562,14.847 7.52392,56.2589 151.82812,56.2589 144.505,-4.4795 138.8947,-63.4073 137.2543,-69.496 z"
- style="font-size:12px;fill:url(#linearGradient2346);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(-0.713434,0,0,0.593331,611.6303,331.6187)"
- sodipodi:nodetypes="ccscccssssccssssc"
- id="path808"
- d="m 133.2453,533.6385 c 5.5681,34.522 3.3747,28.8354 2.261,49.9939 8.3522,6.6817 8.3587,9.7118 27.7892,11.1023 l 63.3029,4.5299 72.7521,19.885 70.3898,4.53 57.397,9.2546 c 21.4051,3.4513 43.2459,1.2613 60.3377,-12.1228 12.7171,-10.6976 16.0188,-14.1161 28.7902,-21.2051 13.3091,-8.6185 21.9494,-36.5789 32.3335,-49.5531 1.9919,-2.4889 3.7393,-10.95 4.4278,-22.3305 l -5.3327,-27.3737 c 8.3192,12.2125 -0.032,8.6775 -4.9887,15.0533 l -55.7787,71.749 c -10.0825,12.9692 -37.1728,15.6215 -44.13,14.4011 L 151.1727,550.402 c -10.1569,-1.7815 -13.043,-7.3735 -17.9274,-16.7635 z"
- style="font-size:12px;fill:url(#linearGradient2348);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- transform="matrix(-0.713434,0,0,0.593331,874.4999,260.3332)"
- style="font-size:12px;fill:url(#radialGradient2350)"
- id="g828"><path
- sodipodi:nodetypes="cssssssssssssssss"
- id="path617"
- d="m 623.051,558.1809 c 0,15.568 -7.0191,19.9901 -10.3755,32.0402 -3.3565,12.05 -17.2242,18.7352 -26.1969,27.018 -8.9726,8.2828 -15.7042,24.2113 -29.8988,34.2407 -23.9356,16.0777 -12.2147,15.9108 -55.7354,13.5484 -26.9426,-1.5032 -69.3756,-10.3159 -100.6566,-7.864 -32.5148,1.3207 -84.5245,-23.6695 -95.4165,-28.1135 -29.042,-8.6998 -54.9636,0.983 -76.3594,-0.811 -21.3322,-0.6076 -32.8545,-7.2443 -32.8545,-22.8123 0,-15.568 16.6899,-39.2577 22.7593,-50.1266 6.0694,-10.8689 20.417,-27.8155 29.9064,-34.6218 9.4894,-6.8064 4.6714,-16.4651 14.9313,-19.8454 10.2601,-3.3802 20.2271,-5.6568 28.6241,-5.797 26.9684,-0.4504 49.0001,3.7456 84.5628,5.0219 35.5625,1.2762 79.9474,20.1629 113.8722,24.4593 33.9248,4.2963 64.4766,3.4517 86.5471,12.5119 22.0706,9.0603 46.2904,5.5832 46.2904,21.1512 z"
- style="font-size:12px;fill:url(#radialGradient2352);fill-rule:evenodd"
- transform="translate(299.3822,60.66899)"
- inkscape:connector-curvature="0" /><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="csccc"
- id="path622"
- d="m 259.8558,470.6394 c 0.2953,4.8109 101.675,22.8503 86.5853,30.6898 -11.7556,4.8107 -109.2553,-5.2947 -125.5638,-7.657 -32.6169,0 -33.0725,15.1098 -54.3334,7.6774 7.087,-10.9758 42.5219,-10.9759 93.3119,-30.7102 z"
- style="font-size:12px;fill:url(#radialGradient2354);fill-opacity:0.38670002;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="ccccc"
- id="path812"
- d="m 442.9361,470.6393 c -29.5291,3.8003 -43.3636,2.9529 -112.2105,-15.9457 -53.4917,0 -129.928,-1.515 -129.928,-13.5834 0,-12.0681 50.4507,-1.7717 103.9424,-1.7717 46.4046,7.087 100.3989,23.9573 138.1961,31.3008 z"
- style="font-size:12px;fill:url(#radialGradient2356);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="ccccc"
- id="path649"
- d="m 414.393,546.905 c -4.7811,2.0921 -16.5739,52.7595 -74.3538,5.2466 8.942,-10.741 -12.8739,-35.4109 -8.0929,-37.5029 41.2815,-6.7084 77.6712,3.4554 90.3585,12.0335 11.5062,26.2957 -3.1308,18.1308 -7.9118,20.2228 z"
- style="font-size:12px;fill:url(#radialGradient2358);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g><path
- transform="matrix(0.713434,0,0,0.593331,127.0736,202.0195)"
- sodipodi:nodetypes="ccccc"
- id="path779"
- d="m 449.2886,674.4449 c 0,15.5085 -23.9742,9.3601 -54.9911,9.3601 -31.0169,0 -57.3311,6.1484 -57.3311,-9.3601 0,-15.5084 48.5446,-45.6309 79.5616,-45.6309 31.0169,0 32.7606,30.1225 32.7606,45.6309 z"
- style="font-size:12px;fill:url(#radialGradient2360);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- style="font-size:12px"
- transform="matrix(-0.385772,-0.136701,0.205899,-0.401883,253.6324,833.1837)"
- id="g851"><path
- sodipodi:nodetypes="csccccc"
- id="path852"
- d="m 222.8887,433.7143 c -25.448,-3.535 -53.3547,-0.2926 -95.3565,5.5575 -20.8718,2.3256 -36.68789,4.8014 -46.25184,3.5567 -4.78197,-0.6224 -7.8995,-2.2287 -9.50728,-5.1415 22.47906,6.9787 28.82782,-1.4969 0.76816,-13.6254 16.54657,-20.1492 26.22623,-33.9305 54.99096,-33.9305 23.2815,0 57.0383,9.9703 95.3565,43.5832 z"
- style="font-size:12px;fill:url(#linearGradient2362);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccccc"
- id="path853"
- d="m 230.9704,435.9243 c -4.6075,16.1567 18.7059,38.1846 -0.4607,32.7187 -19.1666,-5.4659 -30.1038,-20.5459 -25.4963,-36.7026 8.6398,0.1058 10.9475,-0.0693 16.8865,1.1368 -6.5929,-5.7167 -8.1833,-6.7366 -13.3909,-10.758 1.9454,-8.3168 29.1026,-14.9176 38.6859,-12.1847 19.1665,5.4658 -11.617,9.6333 -16.2245,25.7898 z"
- style="font-size:12px;fill:url(#linearGradient2364);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:ry="8.482666"
- sodipodi:rx="4.0950699"
- sodipodi:cy="417.91852"
- sodipodi:cx="115.83204"
- d="m 119.92711,417.91852 a 4.0950699,8.482666 0 0 1 -4.09507,8.48266 4.0950699,8.482666 0 0 1 -4.09507,-8.48266 4.0950699,8.482666 0 0 1 4.09507,-8.48267 4.0950699,8.482666 0 0 1 4.09507,8.48267 z"
- id="path854"
- style="fill:url(#radialGradient2366);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- sodipodi:nodetypes="ccccc"
- id="path855"
- d="m 163.8029,392.1781 c -2.925,6.8413 -4.4345,4.3875 -9.6526,3.2174 -13.9934,-2.9249 -28.3731,-2.2262 -35.9783,-3.2174 0,-2.7463 7.3596,-8.4827 16.0879,-11.4077 13.4083,0 29.543,8.6614 29.543,11.4077 z"
- style="font-size:12px;fill:url(#linearGradient2368);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccsc"
- id="path856"
- d="m 185.4483,440.1489 c 0,5.6541 -2.7502,10.2377 -6.1426,10.2377 -3.3925,0 -6.1426,-4.5836 -6.1426,-10.2377 0,-5.6541 1.7869,-10.9019 5.4784,-9.2744 2.863,1.8196 6.8068,3.6203 6.8068,9.2744 z"
- style="font-size:12px;fill:url(#linearGradient2370);fill-rule:evenodd;stroke-width:1"
- transform="matrix(0.823214,-0.567732,0.567732,0.823214,-216.4326,176.6848)"
- inkscape:connector-curvature="0" /><path
- transform="matrix(1.314235,0.08969686,-0.11836,0.995969,5.893703,-8.555023)"
- sodipodi:nodetypes="ccccc"
- id="path857"
- d="m 133.3823,416.456 c 0,8.0773 -3.9421,14.0403 -5.85,16.3803 -1.6155,0 3.51,-8.303 3.51,-16.3803 0,-8.0773 -5.7105,-12.8703 -4.095,-12.8703 3.6629,0.585 6.435,4.793 6.435,12.8703 z"
- style="font-size:12px;fill:url(#radialGradient2372);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccsc"
- id="path858"
- d="m 141.9884,438.7913 c 4.9369,4.3821 6.6013,8.9745 4.0781,12.0612 -2.5232,3.0869 -8.5709,2.0366 -13.5078,-2.3456 -4.937,-4.3821 -9.4777,-12.4402 -4.0235,-12.1728 5.8803,0.3046 9.1013,0.7076 13.4532,2.4572 z"
- style="font-size:12px;fill:url(#linearGradient2374);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path859"
- d="m 91.26164,437.5162 c -1.75503,4.6848 -10.08432,3.2175 -18.86659,0.2925 -0.29964,-2.9251 6.87387,0.005 6.87387,-4.68 0,-2.3449 -4.83346,-4.3877 -6.28886,-9.3603 11.41481,5.8501 19.45161,11.403 18.28158,13.7478 z"
- style="font-size:12px;fill:#ab8080;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><path
- transform="matrix(0.713434,0,0,0.593331,125.3458,203.484)"
- sodipodi:nodetypes="csccssccssccscc"
- id="path884"
- d="m 504.2853,691.1394 c 15.0713,8.1339 124.27,91.7136 92.2467,122.4177 -38.1657,37.0072 -141.0877,19.5025 -149.3611,37.2014 -28.1293,42.6667 -127.1386,31.8014 -239.0843,31.8014 -55.9729,0 -75.1198,-81.5726 -88.6292,-113.8895 -11.8178,-28.8553 -41.52549,-23.7626 -66.09598,-35.3931 -19.8447,-9.8632 11.10489,-33.1229 44.0627,-49.3001 l 2.22245,-7.1914 c -33.27908,7.8043 -82.69526,49.3015 -61.17715,62.283 28.08057,15.7705 58.68488,13.3666 72.60568,43.8758 15.9592,33.5659 35.7285,116.162 95.3569,116.162 122.5658,-11.5827 214.2644,27.5609 252.3217,-42.5566 11.5827,-19.184 116.6217,0.7715 146.8428,-39.1468 C 636.079,776.726 518.9892,693.0808 499.4511,684.8463 l 4.8342,6.2931 z"
- style="font-size:12px;fill:#defff4;fill-opacity:0.75690002;fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/mystica_Aquarium_fish_-_Amphiprion_percula.svg b/src/activities/reversecount/resource/mystica_Aquarium_fish_-_Amphiprion_percula.svg
deleted file mode 100644
index 7adb96a1e..000000000
--- a/src/activities/reversecount/resource/mystica_Aquarium_fish_-_Amphiprion_percula.svg
+++ /dev/null
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- viewBox="0 0 156.8449 96.011549"
- version="1.0"
- inkscape:version="0.91 r13725"
- width="100%"
- height="100%"
- sodipodi:docname="mystica_Aquarium_fish_-_Amphiprion_percula.svg">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="880"
- inkscape:window-height="651"
- id="namedview103"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="3.1391497"
- inkscape:cx="37.042297"
- inkscape:cy="23.687081"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="g3338" />
- <defs
- id="defs4">
- <filter
- id="filter3288"
- y="-0.13542999"
- width="1.2165999"
- x="-0.10832"
- height="1.2709"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3290"
- stdDeviation="0.50909685" />
- </filter>
- <filter
- id="filter3292"
- y="-0.12575001"
- width="1.1916"
- x="-0.095779002"
- height="1.2515"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3294"
- stdDeviation="0.50909685" />
- </filter>
- <filter
- id="filter3296"
- y="-0.12803"
- width="1.1983"
- x="-0.099154003"
- height="1.2561001"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3298"
- stdDeviation="0.50909685" />
- </filter>
- <filter
- id="filter3300"
- y="-0.1043"
- width="1.1828001"
- x="-0.091421001"
- height="1.2086"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3302"
- stdDeviation="0.50909685" />
- </filter>
- <filter
- id="filter3304"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3306"
- stdDeviation="0.50909685" />
- </filter>
- <filter
- id="filter3428"
- y="-0.23962"
- width="1.2947"
- x="-0.14737"
- height="1.4792"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3430"
- stdDeviation="0.4987628" />
- </filter>
- <filter
- id="filter3432"
- y="-0.20115"
- width="1.2386"
- x="-0.1193"
- height="1.4023"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3434"
- stdDeviation="0.4987628" />
- </filter>
- <filter
- id="filter3436"
- y="-0.22045"
- width="1.2326"
- x="-0.11628"
- height="1.4409"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3438"
- stdDeviation="0.4987628" />
- </filter>
- <filter
- id="filter3440"
- y="-0.1593"
- width="1.2345001"
- x="-0.11727"
- height="1.3186001"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3442"
- stdDeviation="0.4987628" />
- </filter>
- <filter
- id="filter3444"
- y="-0.11531"
- width="1.2004"
- x="-0.10022"
- height="1.2306"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3446"
- stdDeviation="0.4987628" />
- </filter>
- <filter
- id="filter3448"
- y="-0.092794001"
- width="1.2145"
- x="-0.10724"
- height="1.1856"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3450"
- stdDeviation="0.4987628" />
- </filter>
- <linearGradient
- id="linearGradient3458"
- x1="53.990002"
- gradientUnits="userSpaceOnUse"
- y1="55.077999"
- gradientTransform="translate(413.45,390.83)"
- x2="43.23"
- y2="74.135002">
- <stop
- id="stop3454"
- stop-color="#f9b002"
- offset="0" />
- <stop
- id="stop3456"
- stop-color="#f9b002"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3474"
- x1="76.549004"
- spreadMethod="reflect"
- gradientUnits="userSpaceOnUse"
- y1="9.1493998"
- gradientTransform="translate(413.45,390.83)"
- x2="70.861"
- y2="46.191002">
- <stop
- id="stop3470"
- stop-color="#e08402"
- offset="0" />
- <stop
- id="stop3472"
- stop-color="#e04802"
- stop-opacity=".96491"
- offset="1" />
- </linearGradient>
- <filter
- id="filter3287"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3289"
- stdDeviation="0.39635614" />
- </filter>
- <filter
- id="filter3318"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3320"
- stdDeviation="0.34280881" />
- </filter>
- <filter
- id="filter3322"
- y="-0.026148999"
- width="1.2536"
- x="-0.12681"
- height="1.0523"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3324"
- stdDeviation="0.34280881" />
- </filter>
- <filter
- id="filter3326"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3328"
- stdDeviation="0.34280881" />
- </filter>
- <filter
- id="filter3330"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3332"
- stdDeviation="0.34280881" />
- </filter>
- <filter
- id="filter3334"
- y="-0.02231"
- width="1.2288001"
- x="-0.11438"
- height="1.0446"
- color-interpolation-filters="sRGB">
- <feGaussianBlur
- id="feGaussianBlur3336"
- stdDeviation="0.34280881" />
- </filter>
- </defs>
- <g
- id="layer2"
- transform="translate(-416.60191,-392.26817)">
- <g
- id="g3338">
- <path
- id="path2402"
- d="m 428.04,452.25 c 0,0 16.46,13.26 18.92,14.25 2.45,0.98 8.84,4.67 8.84,4.67 0,0 -2.46,5.65 -0.49,8.59 1.96,2.95 5.4,6.64 8.35,5.65 2.95,-0.98 8.36,-4.91 9.83,-6.38 1.47,-1.48 2.46,-4.18 2.46,-4.18 0,0 4.66,0.98 6.88,1.23 2.21,0.24 10.07,-1.23 10.07,-1.23 0,0 7.86,7.13 9.33,7.37 1.48,0.25 11.06,3.44 13.27,3.69 2.21,0.24 13.76,-0.5 15.23,-1.23 1.48,-0.74 7.62,-10.08 7.62,-10.08 0,0 3.44,-1.71 5.65,0.25 2.21,1.97 8.18,6.97 10.07,8.11 2.52,1.51 10.96,-1.71 11.79,-4.18 0.64,-1.88 4.87,-13.31 5.16,-14.25 0.45,-1.42 -0.6,-11.22 -2.6,-12.85 -2.89,-2.36 -11.82,-6.29 -11.89,-6.07 0,0 -8.35,1.48 -7.13,1.48 1.23,0 -7.86,-3.44 -7.86,-3.44 0,0 2.21,-0.98 2.46,-2.21 0.24,-1.23 0.74,-7.62 -0.49,-9.83 -1.23,-2.21 -12.04,-10.56 -14.25,-11.55 -2.21,-0.98 -15.48,-5.65 -18.92,-5.65 -3.44,0 -16.21,-2.21 -16.21,-2.21 0,0 -4.92,-8.6 -9.34,-10.32 -4.42,-1.72 -11.79,-2.21 -14.25,-1.72 -2.46,0.5 -4.42,1.72 -5.4,3.2 -0.99,1.47 -0.49,2.21 -1.48,3.44 -0.98,1.23 -30.95,12.77 -30.95,12.77 0,0 -9.83,6.39 -11.06,9.09 -1.23,2.71 -2.95,5.16 -2.7,7.62 0.24,2.46 2.7,6.88 3.93,8.84 1.23,1.97 5.16,7.62 5.16,7.13 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3474);fill-rule:evenodd;" />
- <path
- id="path2404"
- d="m 437.62,461.34 c 0,0 4.18,-13.76 5.9,-15.97 1.72,-2.21 5.4,-6.63 5.16,-9.83 -0.25,-3.19 -2.71,-10.07 -2.95,-12.04 -0.25,-1.96 -1.23,-9.7 -1.23,-9.7 l -10.81,4.54 c 0,0 0.25,5.66 0.49,7.13 0.25,1.47 3.69,6.39 3.2,8.84 -0.5,2.46 -0.99,9.83 -1.97,11.06 -0.98,1.23 -4.67,10.56 -4.67,10.56 l 6.88,5.41 z"
- inkscape:connector-curvature="0"
- style="fill:#fff4e4;fill-rule:evenodd;" />
- <path
- id="path2406"
- d="m 495.97,411.22 c 0,0 -5.77,5.9 -7.25,8.35 -1.47,2.46 -1.96,4.18 -3.68,5.65 -1.72,1.48 -10.08,6.64 -12.04,10.32 -1.97,3.69 -3.44,10.32 -3.2,11.3 0.25,0.99 6.9,3.91 7.13,5.65 0.55,4.17 -0.74,10.32 -0.74,10.32 l 7.37,5.16 c 0,0 3.2,1.23 6.64,-1.23 3.44,-2.45 4.17,-7.61 4.17,-10.56 0,-2.95 2.46,-15.72 4.67,-20.39 2.21,-4.67 7.37,-16.46 8.6,-17.69 1.23,-1.23 4.79,-5.04 4.79,-5.04 l -16.46,-1.84 z"
- inkscape:connector-curvature="0"
- style="fill:#fff4e4;fill-rule:evenodd;" />
- <path
- id="path2408"
- d="m 538.96,475.34 c 0,0 -1.69,-12.06 -1.23,-15.84 0.62,-4.98 5.04,-15.3 5.04,-15.3 l 3.24,-0.2 3.76,1.43 7.43,-0.55 0.56,1.66 c 0,0 -7.37,7.67 -8.6,16.03 -1.23,8.35 -0.35,17.47 -0.35,17.47 0,0 -4.69,-4.58 -6.96,-4.94 -2.53,-0.41 -2.52,1.47 -2.89,0.24 z"
- inkscape:connector-curvature="0"
- style="fill:#fff4e4;fill-rule:evenodd;filter:url(#filter3287)" />
- <path
- id="path2414"
- d="m 257.72,425.02 a 2.215,2.58415 0 1 1 -4.43,0 2.215,2.58415 0 1 1 4.43,0 z"
- transform="translate(174.25,3.0252)"
- inkscape:connector-curvature="0"
- style="opacity:0.75620003;fill:#021485;stroke:#010499;stroke-width:1.79999995;stroke-linejoin:round" />
- <path
- id="path2428"
- d="m 469.57,403.95 8.86,-8.86"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#bb7300;stroke-width:3.20000005;filter:url(#filter3304)" />
- <path
- id="path2430"
- d="m 474.26,404.38 8.16,-6.51"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#bb7300;stroke-width:3.20000005;filter:url(#filter3300)" />
- <path
- id="path2432"
- d="m 480.16,405.08 7.13,-4.34"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#bb7300;stroke-width:3.20000005;filter:url(#filter3296)" />
- <path
- id="path2434"
- d="m 482.94,408.21 7.56,-4.52"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#bb7300;stroke-width:3.20000005;filter:url(#filter3292)" />
- <path
- id="path2436"
- d="m 487.81,410.46 6.08,-3.82"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#bb7300;stroke-width:3.20000005;filter:url(#filter3288)" />
- <path
- id="path2416"
- d="m 466.7,406.04 c 0,0 3.91,-7.04 4.95,-8.08 1.04,-1.05 5.21,-3.82 5.21,-3.82"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#454545;stroke-width:1px;filter:url(#filter3448)" />
- <path
- id="path2418"
- d="m 469.65,405.77 c 0,0 8.52,-8.16 9.73,-8.77 l 1.22,-0.61"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#454545;stroke-width:1px;filter:url(#filter3444)" />
- <path
- id="path2420"
- d="m 475.65,405.6 8.16,-5.99 h 0.09 l 0.95,-0.52"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#454545;stroke-width:1px;filter:url(#filter3440)" />
- <path
- id="path2422"
- d="m 481.99,405.86 c 0.52,-0.52 9.29,-4.43 9.29,-4.43"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#454545;stroke-width:1px;filter:url(#filter3436)" />
- <path
- id="path2424"
- d="m 484.16,409.77 c 0.26,-0.35 9.03,-4.95 9.03,-4.95"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#454545;stroke-width:1px;filter:url(#filter3432)" />
- <path
- id="path2426"
- d="m 488.59,412.2 7.12,-3.99"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#454545;stroke-width:1px;filter:url(#filter3428)" />
- <path
- id="path2410"
- d="m 456.05,463.3 c 0,0 8.35,3.2 11.3,0.74 2.95,-2.46 4.67,-8.35 3.93,-10.07 -0.74,-1.72 -9.58,-6.88 -12.04,-7.13 -2.46,-0.24 -8.35,-1.96 -8.84,0 -0.5,1.97 0.49,3.93 0.49,3.93"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3458);fill-rule:evenodd" />
- <path
- id="path2412"
- d="m 471.41036,454.07442 c 0,0 -0.70262,6.41722 -4.07784,10.1081 2.5163,-0.95685 8.26748,-0.46252 8.61748,-1.86252 0.49,-1.96 2.45,-8.6 0.24,-10.32 -2.21,-1.72 -6.63,-6.39 -10.81,-5.89 -2.29,0.27 -5.18,-0.11171 -5.82036,0.8382 5.21368,1.87666 7.13056,3.07576 9.70541,5.22252"
- inkscape:connector-curvature="0"
- style="fill:#3e3e3e;fill-opacity:0.81159417;fill-rule:evenodd"
- sodipodi:nodetypes="ccssccc" />
- <path
- id="path2465"
- d="m 41.274,80.029 c 0,0 9.827,2.457 12.284,2.703 2.457,0.246 8.844,0.983 8.844,0.983"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#ca5f00;stroke-width:1px;" />
- <path
- id="path2467"
- d="m 79.845,83.715 c 0,0 14.25,-3.44 22.605,-3.44 8.35,0 22.6,3.685 22.6,3.685"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#ca5f00;stroke-width:1px;" />
- <path
- id="path2469"
- d="m 128.98,53.005 c 0,0 -14.74,-13.512 -17.69,-16.461 C 108.34,33.596 98.517,24.015 98.517,24.015"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#ca5f00;stroke-width:1px;" />
- <path
- id="path2471"
- d="m 463.02589,407.70938 c 0,0 13.35479,1.48071 15.69694,1.97495 2.34309,0.49323 13.35479,2.71429 13.35479,2.71429"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#ca5f00;stroke-width:0.9787643px" />
- <path
- id="path2478"
- d="m 17.638,64.438 2.876,-7.379 c 0,0 1.474,-2.457 1.72,-3.317 0.246,-0.86 1.597,-9.704 1.597,-11.178 0,-1.475 -2.948,-7.248 -2.948,-7.248 L 20.514,33.842 20.146,28.56"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:1px;filter:url(#filter3334)" />
- <path
- id="path2480"
- d="m 25.059,69.588 2.334,-8.599 c 0,0 1.474,-5.036 2.211,-5.896 0.737,-0.86 5.528,-6.879 5.651,-9.213 0.123,-2.334 -2.211,-9.827 -2.211,-9.827 0,0 -0.737,-2.088 -0.737,-3.071 0,-0.983 -0.737,-9.213 -0.737,-9.213"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:1px;filter:url(#filter3330)" />
- <path
- id="path2482"
- d="m 81.811,21.435 c 0,0 -4.914,4.545 -5.651,6.019 -0.737,1.474 -1.842,4.668 -3.194,5.897 -1.351,1.228 -6.633,4.667 -7.739,5.65 -1.105,0.983 -4.422,3.44 -5.159,4.422 -0.737,0.983 -2.948,6.02 -3.071,7.616 -0.123,1.597 -0.86,4.791 -0.86,4.791 0,0 6.879,4.3 7.125,5.037 0.246,0.737 0.614,6.387 0.246,7.738 -0.369,1.352 -0.737,3.563 -0.737,3.563 l 6.756,4.79 c 0,0 4.913,1.352 7.125,-0.737 2.211,-2.088 4.176,-5.65 4.176,-7.247 0,-1.597 0.369,-6.388 0.369,-7.002 0,-0.614 2.579,-12.775 2.948,-13.635 0.368,-0.86 4.668,-9.827 5.036,-10.933 0.369,-1.105 4.422,-9.827 4.422,-9.827 l 3.931,-4.054"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:1px;filter:url(#filter3326)" />
- <path
- id="path2484"
- d="m 125.42,83.715 c 0,0 -1.84,-12.039 -1.35,-14.373 0.49,-2.334 2.82,-9.704 3.19,-10.809 0.37,-1.106 2.21,-5.282 2.21,-5.282"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:1px;filter:url(#filter3322)" />
- <path
- id="path2486"
- d="m 135.61,88.628 c 0,0 -0.24,-15.232 0.37,-18.303 0.62,-3.071 4.06,-8.967 4.67,-9.95 0.61,-0.983 3.69,-5.282 3.69,-5.282"
- transform="translate(413.45,390.83)"
- inkscape:connector-curvature="0"
- style="fill:none;stroke:#000000;stroke-width:1px;filter:url(#filter3318)" />
- </g>
- </g>
- <metadata
- id="metadata101">
- <rdf:RDF>
- <cc:Work>
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:publisher>
- <cc:Agent
- rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:title>Aquarium fish - Amphiprion percula</dc:title>
- <dc:date>2008-03-14T11:38:06</dc:date>
- <dc:description>A Aquarium fish! Amphiprion percula.... Enjoy! :-)</dc:description>
- <dc:source>http://openclipart.org/detail/15746/aquarium-fish---amphiprion-percula-by-mystica</dc:source>
- <dc:creator>
- <cc:Agent>
- <dc:title>mystica</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>animal</rdf:li>
- <rdf:li>aquarium</rdf:li>
- <rdf:li>clip art</rdf:li>
- <rdf:li>clipart</rdf:li>
- <rdf:li>colour</rdf:li>
- <rdf:li>fish</rdf:li>
- <rdf:li>image</rdf:li>
- <rdf:li>media</rdf:li>
- <rdf:li>no contour</rdf:li>
- <rdf:li>png</rdf:li>
- <rdf:li>public domain</rdf:li>
- <rdf:li>svg</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/src/activities/reversecount/resource/narval.svg b/src/activities/reversecount/resource/narval.svg
deleted file mode 100644
index b5ce3505f..000000000
--- a/src/activities/reversecount/resource/narval.svg
+++ /dev/null
@@ -1,317 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg1729"
- sodipodi:version="0.32"
- width="449.20172"
- height="382.61404"
- xml:space="preserve"
- sodipodi:docname="narval.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.0"><metadata
- id="metadata68"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs1731"><linearGradient
- id="linearGradient2001"><stop
- style="stop-color:#6a5f05;stop-opacity:1;"
- offset="0"
- id="stop2002" /><stop
- style="stop-color:#ede3ff;stop-opacity:1;"
- offset="1"
- id="stop2003" /></linearGradient><linearGradient
- id="linearGradient1983"><stop
- style="stop-color:#4d3f00;stop-opacity:1;"
- offset="0"
- id="stop1984" /><stop
- style="stop-color:#bac5d2;stop-opacity:0;"
- offset="1"
- id="stop1985" /></linearGradient><linearGradient
- id="linearGradient1893"><stop
- style="stop-color:#00b7c5;stop-opacity:0.2471;"
- offset="0"
- id="stop1894" /><stop
- style="stop-color:#00a3b0;stop-opacity:0.7725;"
- offset="1"
- id="stop1895" /></linearGradient><linearGradient
- id="linearGradient1796"><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop1797" /><stop
- style="stop-color:#b0b0ab;stop-opacity:0;"
- offset="1"
- id="stop1798" /></linearGradient><linearGradient
- id="linearGradient1758"><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop1759" /><stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop1760" /></linearGradient><linearGradient
- id="linearGradient1752"><stop
- style="stop-color:#87775a;stop-opacity:1;"
- offset="0"
- id="stop1753" /><stop
- style="stop-color:#fff7d5;stop-opacity:1;"
- offset="1"
- id="stop1754" /></linearGradient><linearGradient
- id="linearGradient1740"><stop
- style="stop-color:#87856d;stop-opacity:1;"
- offset="0"
- id="stop1741" /><stop
- style="stop-color:#bac5d2;stop-opacity:1;"
- offset="1"
- id="stop1742" /></linearGradient><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1740"
- id="linearGradient3459"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3881386,-0.2946987,0.07214528,0.1823001,-64.613876,639.19487)"
- x1="367.58081"
- y1="1471.8438"
- x2="362.41113"
- y2="754.23322" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1740"
- id="linearGradient3461"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.5195904,-0.1929668,0.1281821,0.5908157,18.87944,754.7923)"
- x1="384.02103"
- y1="106.48047"
- x2="725.68665"
- y2="107.35426" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1740"
- id="linearGradient3463"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.1790053,-0.437862,0.05649013,0.2603738,18.87944,754.7923)"
- x1="141.94717"
- y1="-29.799664"
- x2="97.991142"
- y2="-30.863411" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1740"
- id="linearGradient3465"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.6460682,-0.2399385,0.1030884,0.4751544,18.87944,754.7923)"
- x1="142.19553"
- y1="168.70644"
- x2="201.17097"
- y2="168.70644" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1758"
- id="radialGradient3467"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0801237,0.9258199)"
- spreadMethod="pad"
- cx="238.90309"
- cy="734.55731"
- fx="238.90309"
- fy="734.55731"
- r="6.7875848" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1796"
- id="radialGradient3469"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.2836379,0.7790359)"
- cx="136.14594"
- cy="681.19696"
- fx="136.14594"
- fy="681.19696"
- r="11.950172" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1752"
- id="linearGradient3471"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.9713494,1.0294956)"
- spreadMethod="reflect"
- x1="121.59292"
- y1="435.76712"
- x2="117.66864"
- y2="438.26077" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1740"
- id="linearGradient3473"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.8262362,-0.6718025,-0.1740603,-0.1942154,295.20727,836.47833)"
- x1="305.30508"
- y1="1581.9412"
- x2="300.69092"
- y2="941.44409" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2001"
- id="linearGradient3475"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.5946634,-1.2365783,-0.3036729,-0.3916097,-14.71808,585.68998)"
- x1="82.445717"
- y1="-59.090939"
- x2="262.41537"
- y2="-29.709515" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1983"
- id="linearGradient3477"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.5943306,1.2363202,-0.3037362,0.3916914,-14.71808,465.95718)"
- x1="88.951096"
- y1="-184.6066"
- x2="278.67465"
- y2="360.65692" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1758"
- id="radialGradient3479"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.0801237,0.9258199)"
- spreadMethod="pad"
- cx="238.90309"
- cy="734.55731"
- fx="238.90309"
- fy="734.55731"
- r="6.7875848" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2001"
- id="linearGradient3481"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.8668569,1.1535929)"
- x1="193.07133"
- y1="558.82855"
- x2="288.29803"
- y2="623.94037" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2001"
- id="linearGradient3483"
- gradientUnits="userSpaceOnUse"
- x1="474.68741"
- y1="828.06885"
- x2="539.84375"
- y2="828.06885" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1893"
- id="linearGradient5359"
- x1="66.7995"
- y1="727.875"
- x2="539.45898"
- y2="727.875"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="0.47763667"
- inkscape:cx="111.3386"
- inkscape:cy="220.12722"
- inkscape:window-width="1016"
- inkscape:window-height="575"
- inkscape:window-x="0"
- inkscape:window-y="1"
- inkscape:current-layer="svg1729"
- showgrid="false"
- inkscape:window-maximized="0"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0" /><g
- id="g3438"
- transform="matrix(0.8000002,0,0,0.8000002,17.326615,-297.3258)"><g
- transform="translate(0,0.04958647)"
- id="g3411"><path
- style="font-size:12px;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="m 145.3117,575.9724 c -6.8608,2.4197 -18.4596,-10.237 -27.8175,-24.4483 -5.9505,-12.0428 7.1225,-6.2455 7.187,-5.0454 9.3578,14.2113 27.4912,27.0738 20.6305,29.4937 z"
- id="path1793"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="csssssssssssss"
- id="path1772"
- d="m 285.60997,722.0098 c 0.51188,4.08837 -49.18039,-25.63825 -109.22942,45.10823 -6.7689,7.98768 -44.9075,61.11666 -71.74728,70.24131 -8.953068,2.66781 -25.294468,7.94951 -26.869131,7.35553 -0.842409,-0.24048 -2.14073,-1.1403 -2.147772,-1.87068 -0.0334,-1.64425 8.109158,-5.82524 10.549406,-6.44104 4.470415,-1.09709 8.792309,-7.88868 8.600672,-7.52013 -1.047293,1.89442 -5.162742,6.38488 -9.317464,7.46149 -2.24009,0.58953 -9.382506,4.73242 -9.955267,6.07098 -0.356569,0.78065 -2.119461,-2.10898 -2.239982,-2.87379 -0.576294,-3.1502 0.899309,-5.05738 -0.519758,-8.53845 -17.373079,-42.67924 6.961817,-50.50106 21.023854,-72.75522 10.057062,-16.89604 30.856722,-41.78863 72.307572,-61.24577 41.45085,-19.45718 117.3651,6.0049 119.54457,25.00754 z"
- style="font-size:12px;fill:url(#linearGradient3459);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="csssssccsc"
- id="path1773"
- d="m 287.44608,728.75369 c 0.901,27.08191 1.50044,16.92832 -2.06597,37.95684 -0.76113,5.64278 -10.03585,-6.55884 -15.24646,-22.63151 -3.46374,-10.44346 -10.93392,-22.14811 -16.27378,-22.97191 -5.2014,-0.96634 -8.16162,-4.75244 -3.52601,-4.91722 4.63587,-0.16481 16.35846,1.87975 17.07506,2.09805 36.12371,11.35448 -0.23749,-13.98749 -2.10278,-14.4897 8.27033,3.70751 24.41599,-15.318 38.7483,-12.15761 3.68725,1.82422 2.06756,2.16431 0.54768,5.41892 -7.72847,16.24544 -17.23262,15.40391 -17.15604,31.69414 z"
- style="font-size:12px;fill:url(#linearGradient3461);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1775"
- d="m 186.38057,690.74855 c 0.96232,2.43167 -7.51947,-0.17984 -25.7844,8.96997 -15.49865,9.88037 -24.96661,16.38514 -25.62673,15.61127 -0.38806,-0.98045 16.35641,-12.34707 31.0087,-23.47197 2.93672,-3.17337 19.5987,-2.2459 20.40243,-1.10927 z"
- style="font-size:12px;fill:url(#linearGradient3463);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1776"
- d="m 163.41597,794.34453 c 7.14319,4.29205 8.90424,13.66021 3.93342,20.92433 -4.97092,7.26415 -27.43912,2.57582 -34.58239,-1.71612 -7.14324,-4.29204 2.9872,-7.01688 7.95806,-14.28108 4.97091,-7.26415 15.54758,-9.21912 22.69091,-4.92713 z"
- style="font-size:12px;fill:url(#linearGradient3465);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.1535455,-0.1305841,0.09599405,0.2647425,-7.6250954,672.69215)"
- sodipodi:ry="10.022522"
- sodipodi:rx="11.692947"
- sodipodi:cy="678.18805"
- sodipodi:cx="262.25598"
- d="m 273.94893,678.18805 a 11.692947,10.022522 0 0 1 -11.69295,10.02252 11.692947,10.022522 0 0 1 -11.69295,-10.02252 11.692947,10.022522 0 0 1 11.69295,-10.02252 11.692947,10.022522 0 0 1 11.69295,10.02252 z"
- id="path1777"
- style="font-size:12px;fill:url(#radialGradient3467);fill-rule:evenodd;stroke-width:1"
- sodipodi:type="arc" /><path
- sodipodi:type="arc"
- style="fill:url(#radialGradient3469);fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path1794"
- d="M 197.64558,530.677 A 22.459724,13.630737 0 0 1 175.18585,544.30774 22.459724,13.630737 0 0 1 152.72613,530.677 22.459724,13.630737 0 0 1 175.18585,517.04626 22.459724,13.630737 0 0 1 197.64558,530.677 Z"
- sodipodi:cx="175.18585"
- sodipodi:cy="530.677"
- sodipodi:rx="22.459724"
- sodipodi:ry="13.630737"
- transform="translate(-1.239147,-4.956696)" /><path
- sodipodi:nodetypes="csss"
- id="path2008"
- d="M 122.5897,532.7431 C 119.5873,529.4265 -23.40369,373.296 -21.64212,371.6179 c 1.97695,-1.4525 149.49412,150.6727 152.23652,153.3834 7.0638,6.9826 -0.8183,15.6804 -8.0047,7.7418 z"
- style="font-size:12px;fill:url(#linearGradient3471);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:url(#linearGradient3473);fill-rule:evenodd"
- d="m 171.1875,509.4375 c -9.92755,0.0689 -19.95359,4.73632 -30.1875,16.5 -3.89649,4.54757 -5.8358,1.70022 -8.84375,1.53125 2.46669,2.58237 -4.60316,10.25519 -7.6875,8.0625 -2.55274,3.52259 -1.24675,3.79744 -5.3125,6.5625 -1.00077,0.63533 -4.01529,2.44531 -2.65625,2.6875 2.30316,0.34346 13.21141,11.37596 15.625,15.21875 2.90616,4.65791 7.85979,8.47787 11.90625,10.84375 -3.87465,-2.02104 -8.86919,-5.20714 -11.46875,-9.46875 -2.59162,-4.20046 -14.25219,-17.07161 -16.5625,-16.125 -1.03174,0.40602 -1.40785,3.30617 -1.15625,5 0.26528,3.24383 12.86187,19.9789 19.875,36.8125 18.81771,44.20598 75.52273,93.88332 91.625,102.15625 113.1168,58.23181 206.76488,133.46659 243.53125,160.65625 l 23.875,0 C 503.39989,796.10286 311.73641,596.24891 252.78125,560.75 225.22339,544.11885 198.63425,509.24698 171.1875,509.4375 z"
- id="path2006"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:url(#linearGradient3475);fill-rule:evenodd"
- d="m 171.59375,510.40625 c -9.92745,0.0822 -19.96944,4.75385 -30.1875,16.53125 -3.89033,4.55278 -5.80429,1.69623 -8.8125,1.53125 2.47017,2.57912 -4.60031,10.25096 -7.6875,8.0625 -2.54812,3.52588 -1.25057,3.82312 -5.3125,6.59375 -0.99996,0.63662 -4.01566,2.44723 -2.65625,2.6875 2.30357,0.34044 13.23749,11.37911 15.65625,15.21875 2.78887,4.45652 7.45928,8.15208 11.40625,10.53125 -3.79715,-2.0294 -8.47904,-5.11835 -10.96875,-9.1875 -2.59727,-4.19705 -14.28467,-17.04339 -16.59375,-16.09375 -1.03117,0.40743 -1.41014,3.30647 -1.15625,5 0.26967,3.24351 12.90166,19.95714 19.9375,36.78125 18.87722,44.18069 75.63661,93.78002 91.75,102.03125 112.45651,57.70071 205.69734,132.19645 243,159.78125 l 24.71875,0 C 502.95769,795.33801 312.06499,596.90056 253.25,561.59375 225.66977,544.99968 199.04022,510.17884 171.59375,510.40625 z"
- id="path1987"
- inkscape:connector-curvature="0" /><path
- id="path1981"
- d="m 148.26828,530.55363 c -1.7557,2.0004 -4.13716,2.78097 -5.31916,1.74354 -1.18212,-1.03745 -0.71712,-3.50005 1.03858,-5.50045 1.75567,-2.00036 4.1371,-2.78106 5.31921,-1.74361 1.18209,1.03748 0.71703,3.50016 -1.03863,5.50052 z m 11.03862,-9.25647 c -1.3566,1.54577 -2.89866,2.41068 -3.44424,1.93195 -0.54558,-0.47889 0.11195,-2.12008 1.46866,-3.66584 1.35671,-1.54576 2.89863,-2.4108 3.44424,-1.93195 0.54561,0.47884 -0.11195,2.12007 -1.46866,3.66584 z m -5.09063,16.51299 c -0.56056,2.35377 -2.44617,3.921 -4.21142,3.50061 -1.76545,-0.42048 -2.74201,-2.66934 -2.18153,-5.02317 0.56052,-2.35373 2.44604,-3.92102 4.21142,-3.50061 1.76533,0.42046 2.74208,2.66939 2.18153,5.02317 z m 9.09757,5.3847 c -1.47436,2.64087 -3.86827,4.11244 -5.34716,3.28685 -1.47903,-0.82574 -1.48258,-3.63581 -0.008,-6.27662 1.47425,-2.64089 3.86827,-4.11245 5.34724,-3.28679 1.47889,0.82559 1.4825,3.63575 0.008,6.27656 z m 10.43449,0.0469 c -1.13899,2.13479 -3.27375,3.21897 -4.76797,2.4218 -1.49434,-0.79735 -1.78249,-3.17433 -0.6435,-5.30911 1.13907,-2.13472 3.27387,-3.21895 4.76812,-2.42166 1.49433,0.79736 1.78242,3.17425 0.64335,5.30897 z m -4.66111,-8.1148 c -0.0992,1.87943 -1.01081,3.35903 -2.03602,3.30479 -1.02507,-0.0541 -1.77564,-1.6216 -1.67633,-3.50101 0.0994,-1.87939 1.01101,-3.35895 2.03608,-3.30486 1.02509,0.0542 1.77559,1.62167 1.67627,3.50108 z m 13.57031,-10.84698 c -0.43026,0.72947 -2.29949,0.4239 -4.17523,-0.68253 -1.8756,-1.10628 -3.04749,-2.59459 -2.61714,-3.324 0.4303,-0.72935 2.2996,-0.42388 4.17523,0.68254 1.87574,1.10642 3.04748,2.59459 2.61714,3.32399 z m 19.21303,6.12676 c -0.76087,1.37645 -3.3517,1.40123 -5.78718,0.0553 -2.43532,-1.34597 -3.79287,-3.55293 -3.03207,-4.92944 0.76064,-1.37647 3.3517,-1.40123 5.787,-0.0554 2.43535,1.34593 3.79297,3.55295 3.03225,4.92953 z m -16.70247,18.54285 c -1.43649,1.63673 -3.92784,1.79889 -5.56447,0.36257 -1.63665,-1.43645 -1.79893,-3.92776 -0.36245,-5.56449 1.43644,-1.63666 3.92776,-1.79895 5.56441,-0.36249 1.63666,1.43644 1.79905,3.92777 0.36251,5.56441 z m -9.33541,13.95732 c -1.7557,2.00041 -4.5058,2.45757 -6.14245,1.02112 -1.63666,-1.43644 -1.54016,-4.22263 0.21543,-6.22305 1.75577,-2.00034 4.50583,-2.45745 6.14248,-1.021 1.6367,1.43639 1.54024,4.22253 -0.21546,6.22293 z m 26.42889,-20.81431 c -0.87788,1.00024 -3.35859,0.25833 -5.54079,-1.65689 -2.18226,-1.9153 -3.23964,-4.27876 -2.36182,-5.27892 0.87788,-1.00024 3.35855,-0.25829 5.54079,1.65688 2.18215,1.91529 3.23961,4.27881 2.36182,5.27893 z m -5.01263,9.58579 c -1.03171,0.84058 -3.35473,-0.30263 -5.18883,-2.55365 -1.83404,-2.25095 -2.48452,-4.75728 -1.45281,-5.59787 1.03171,-0.84059 3.35491,0.30289 5.18886,2.55378 1.8341,2.25103 2.48445,4.75721 1.45278,5.59774 z m -4.66768,5.7145 c 0.50762,2.48936 -0.33022,4.76205 -1.87121,5.07629 -1.541,0.31424 -3.20185,-1.44905 -3.70941,-3.93847 -0.50753,-2.4893 0.33027,-4.76212 1.87121,-5.07629 1.541,-0.31424 3.20173,1.44903 3.70941,3.93847 z m -5.97478,12.91257 c 0.56217,2.35341 -0.50838,4.62579 -2.39119,5.0755 -1.8827,0.44972 -3.86458,-1.09343 -4.42675,-3.44684 -0.56217,-2.3534 0.50827,-4.6258 2.39093,-5.07564 1.88284,-0.44959 3.86484,1.09358 4.42701,3.44698 z m 28.10097,-27.782 c -1.03745,1.18202 -3.5738,0.65238 -5.66511,-1.18309 -2.09125,-1.83554 -2.94564,-4.28175 -1.90819,-5.46377 1.03744,-1.18202 3.57371,-0.65226 5.66512,1.18322 2.09122,1.83542 2.94562,4.28163 1.90818,5.46364 z m -1.36174,14.83504 c -0.95771,1.09112 -3.79785,0.16422 -6.34381,-2.07027 -2.54598,-2.23445 -3.83358,-4.93044 -2.87594,-6.02162 0.9576,-1.09113 3.79783,-0.16418 6.34389,2.07033 2.54587,2.23443 3.83347,4.93042 2.87586,6.02156 z m -5.49782,7.46862 c 1.17725,2.52123 0.88744,5.14597 -0.64719,5.86258 -1.53463,0.7166 -3.73319,-0.74638 -4.91043,-3.26761 -1.17729,-2.52117 -0.88748,-5.14591 0.64716,-5.86253 1.53463,-0.7166 3.73318,0.74638 4.91046,3.26756 z m -8.59143,7.04256 c 1.57392,1.99434 1.84894,4.40098 0.61438,5.37521 -1.23464,0.97434 -3.51146,0.14738 -5.08524,-1.84699 -1.57389,-1.99439 -1.8491,-4.40093 -0.61435,-5.37526 1.23456,-0.97423 3.51135,-0.14739 5.08521,1.84704 z m 22.72392,-1.10369 c -0.63849,0.72744 -2.70392,-0.0415 -4.61336,-1.71741 -1.90948,-1.67585 -2.93985,-3.62408 -2.3014,-4.35145 0.63837,-0.72744 2.7039,0.0414 4.61326,1.71722 1.90956,1.67591 2.93987,3.62421 2.3015,4.35164 z m 7.53748,-10.58065 c -0.87768,1.00031 -3.43215,0.19376 -5.70533,-1.80141 -2.2732,-1.99501 -3.40422,-4.4231 -2.52643,-5.42339 0.87779,-1.00013 3.43211,-0.19371 5.70542,1.80148 2.27308,1.99498 3.40425,4.42321 2.52634,5.42332 z m -17.37745,31.09033 c -1.27671,1.45483 -4.00723,1.1462 -6.09856,-0.68923 -2.09131,-1.83547 -2.75156,-4.50282 -1.47467,-5.95757 1.27687,-1.45488 4.00731,-1.14631 6.09862,0.68916 2.0913,1.83547 2.75147,4.50277 1.47461,5.95764 z m 11.09559,-6.00042 c -1.11717,1.27291 -3.79199,0.75227 -5.97413,-1.16301 -2.18232,-1.91523 -3.04565,-4.4999 -1.92836,-5.7728 1.11722,-1.27298 3.79191,-0.75235 5.97418,1.16294 2.18223,1.91535 3.04564,4.4999 1.92831,5.77287 z m 20.74373,-22.30658 c -0.71829,0.81826 -3.29072,-0.26506 -5.74577,-2.41981 -2.45491,-2.1546 -3.86294,-4.56474 -3.14459,-5.38307 0.71817,-0.81827 3.29052,0.265 5.74562,2.41967 2.45497,2.15469 3.86289,4.56481 3.14474,5.38321 z m 4.70002,12.57725 c -0.9576,1.09114 -3.42927,0.4877 -5.5206,-1.34773 -2.0913,-1.83548 -3.01034,-4.20795 -2.05262,-5.29908 0.95752,-1.09119 3.42919,-0.48775 5.52048,1.34773 2.09142,1.83549 3.01046,4.20796 2.05274,5.29908 z m -6.96661,14.57919 c -0.8778,1.00029 -4.16938,-0.45329 -7.35176,-3.24632 -3.18241,-2.79315 -5.05078,-5.86831 -4.17288,-6.86841 0.87788,-1.00023 4.16936,0.45316 7.35176,3.24632 3.18246,2.79309 5.05076,5.86817 4.17288,6.86841 z m -10.15508,10.90644 c -1.03745,1.18203 -4.16351,0.13477 -6.98233,-2.33923 -2.81866,-2.47388 -4.26273,-5.43757 -3.22524,-6.61965 1.03744,-1.18202 4.16351,-0.13477 6.98228,2.33912 2.81861,2.47395 4.26267,5.43766 3.22529,6.61976 z m -3.23066,24.27006 c -1.27692,1.45478 -5.62894,-0.27704 -9.72067,-3.86821 -4.09172,-3.59118 -6.37361,-7.68172 -5.09676,-9.13657 1.27693,-1.45478 5.62895,0.27703 9.72059,3.86815 4.09179,3.59124 6.37368,7.68178 5.09684,9.13663 z m 23.38738,-12.69977 c -0.9576,1.09113 -3.79784,0.1642 -6.34371,-2.07024 -2.54603,-2.23455 -3.83364,-4.93053 -2.87604,-6.02166 0.95771,-1.09111 3.79796,-0.16419 6.34391,2.0703 2.54595,2.23449 3.83356,4.93048 2.87584,6.0216 z m 1.4495,-18.2557 c -0.87788,1.00024 -3.43223,0.1937 -5.7054,-1.80134 -2.27319,-1.99518 -3.40428,-4.42335 -2.52648,-5.42347 0.87782,-1.00017 3.43229,-0.19362 5.70545,1.80143 2.27311,1.99511 3.40425,4.42321 2.52643,5.42338 z m 15.61524,-10.48584 c -1.11728,1.2729 -4.7503,-0.0888 -8.11457,-3.0415 -3.36421,-2.95265 -5.18589,-6.37832 -4.06864,-7.65135 1.11733,-1.27297 4.75031,0.0888 8.11458,3.0415 3.36426,2.95273 5.18577,6.37831 4.06863,7.65135 z m 5.89623,11.87849 c -0.87783,1.00016 -3.57967,0.0643 -6.03472,-2.09044 -2.45498,-2.15468 -3.73348,-4.71227 -2.85576,-5.71246 0.87787,-1.00023 3.57967,-0.0643 6.03483,2.09045 2.45497,2.15468 3.73353,4.71221 2.85565,5.71245 z m -5.14234,21.13488 c -0.87786,1.00022 -3.50597,0.12904 -5.87005,-1.94589 -2.36413,-2.07488 -3.56895,-4.56773 -2.69109,-5.56794 0.87786,-1.00021 3.50598,-0.12903 5.87006,1.9459 2.36411,2.07488 3.56893,4.56773 2.69108,5.56793 z m -5.31061,23.3191 c -1.19706,1.36387 -5.33711,-0.3123 -9.24691,-3.74382 -3.90977,-3.43155 -6.10904,-7.31908 -4.91194,-8.68299 1.19706,-1.36388 5.33701,0.31228 9.24689,3.74385 3.90981,3.43151 6.10895,7.31902 4.91196,8.68296 z m 24.87964,-18.38512 c -1.03745,1.18203 -4.16351,0.13477 -6.98216,-2.33913 -2.81867,-2.47385 -4.26273,-5.43757 -3.22528,-6.6196 1.03745,-1.18202 4.1635,-0.13476 6.98207,2.33907 2.81876,2.47392 4.26281,5.43764 3.22537,6.61966 z m 13.92152,-7.89205 c -0.79799,0.90929 -4.3196,-0.87659 -7.86577,-3.989 -3.54614,-3.11229 -5.77392,-6.37246 -4.97586,-7.28169 0.79811,-0.90927 4.31968,0.87665 7.86581,3.98895 3.54618,3.1124 5.774,6.37252 4.97582,7.28174 z M 464.53003,844.37805 C 451.03398,834.2132 432.06395,819.59891 408.80674,802.58775 362.29233,768.56544 298.62923,724.95568 227.312,688.17913 c -16.0965,-8.28412 -72.75331,-58.01439 -91.54022,-102.23339 -7.00155,-16.8386 -19.59382,-33.58202 -19.85694,-36.82615 -0.2503,-1.69388 0.11503,-4.58882 1.14707,-4.99412 2.31091,-0.94499 13.96798,11.93503 16.55675,16.13733 4.69857,7.71483 17.37765,12.09583 16.71969,11.93778 -3.42553,-0.92805 -12.69241,-6.16132 -17.14008,-13.30086 -2.41083,-3.84446 -13.31101,-14.8872 -15.61391,-15.23226 -1.35897,-0.24312 1.65612,-2.06193 2.65733,-2.69657 4.06772,-2.76224 2.74996,-3.04741 5.30525,-6.56819 3.08279,2.19479 10.16628,-5.47319 7.70125,-8.05731 3.00787,0.17111 4.93042,3.02398 8.83014,-1.52084 38.55835,-44.25981 74.27169,12.22436 111.78167,34.89726 32.00528,19.30187 103.11671,87.11278 159.86477,153.6615 28.37403,33.27436 53.15723,66.23318 67.66589,92.65504 7.25433,13.21093 11.94003,24.78762 13.22164,33.9524 1.2816,9.16478 -16.58623,14.55215 -30.08227,4.3873 z"
- style="font-size:12px;fill:url(#linearGradient3477);fill-rule:evenodd;stroke-width:1"
- sodipodi:nodetypes="csssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccsssccscccccccccccccssss"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.3378711,0.2747189,-0.2987853,0.3333829,281.08895,276.52099)"
- sodipodi:ry="10.022522"
- sodipodi:rx="11.692947"
- sodipodi:cy="678.18805"
- sodipodi:cx="262.25598"
- d="m 273.94893,678.18805 a 11.692947,10.022522 0 0 1 -11.69295,10.02252 11.692947,10.022522 0 0 1 -11.69295,-10.02252 11.692947,10.022522 0 0 1 11.69295,-10.02252 11.692947,10.022522 0 0 1 11.69295,10.02252 z"
- id="path2011"
- style="font-size:12px;fill:url(#radialGradient3479);fill-rule:evenodd;stroke-width:1"
- sodipodi:type="arc" /><path
- style="font-size:12px;fill:url(#linearGradient3481);fill-rule:evenodd"
- d="m 203.3178,689.4569 c -10.3319,11.5283 -28.1301,13.2125 -39.7534,3.7617 -11.6233,-9.4508 4.7027,-46.9394 15.0348,-58.4678 10.3319,-11.5283 11.8511,6.0488 23.4743,15.4996 11.6233,9.4507 11.5762,27.6783 1.2443,39.2065 z"
- id="path2010"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:url(#linearGradient3483);fill-opacity:1;fill-rule:evenodd"
- d="m 436.53125,806.28125 c -2.92012,0.30814 -3.86236,4.47129 0,10.125 4.84467,6.74304 9.34361,20.33707 7.78125,33.46875 l 29.75,0 c -3.31666,-3.49656 -7.24265,-8.2507 -11.90625,-14.53125 -0.87005,-1.17372 -13.41716,-19.43479 -19.8125,-26.0625 -2.19828,-2.27821 -4.28291,-3.1614 -5.8125,-3 z m 46.65625,6.5 c 1.55319,3.90866 7.44133,25.20745 6.9375,37.09375 l 49.71875,0 C 522.04239,831.81291 489.95252,826.63142 483.1875,812.78125 z"
- id="path2043"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:#6f6442;fill-rule:evenodd"
- d="m 393.76921,692.33365 c -2.7741,3.09536 -10.49649,-8.53458 -36.34021,-37.53113 -24.93353,-23.46641 -39.88257,-38.25383 -39.24881,-39.89603 1.11859,-1.24815 28.09035,24.43647 54.19461,45.66157 6.5714,3.74645 22.44202,29.66151 21.39441,31.76559 z"
- id="path2009"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:none;stroke:#000000;stroke-linecap:round"
- d="m 116.6662,545.3926 c 4.3776,1.1107 8.3063,5.3703 10.9419,8.9758 5.1283,9.2301 12.399,15.7638 17.1004,17.3303 1.3863,0.4617 2.2004,1.4054 3.5595,1.9888"
- id="path2111"
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0" /><path
- style="font-size:12px;fill:url(#linearGradient5359);fill-opacity:1;fill-rule:evenodd"
- d="m 309.55271,605.875 c 17.077,28.3544 -134.6711,42.85686 -145.875,23.71875 6.0807,9.4936 9.10645,10.49053 10.28125,12.375 -10.5971,20.1622 -19.24346,41.39087 -7.78125,50.71875 -15.7992,11.8063 -58.89683,37.71271 -71.843746,65 -9.75387,20.5832 -37.36608,26.02823 -23.90625,63.78125 0.62173,2.0234 2.82669,7.32225 3.40625,11.46875 0.57956,4.1465 -0.4384,7.14152 2.46875,9.46875 7.17137,5.7098 24.186916,-4.20942 31.687496,-5.5625 3.5634,-0.6706 23.4288,-16.66977 28.4375,-21.78125 16.2132,3.4077 22.98465,7.59189 29.15625,2.25 11.7283,-10.4198 3.93665,-22.43512 -8.09375,-26.53125 18.329,-15.5584 32.23751,-51.04143 82.6875,-69.03125 31.3942,-11.6518 26.35291,33.86146 45.25,46.21875 4.3371,-9.328 3.43649,-24.98332 3.0625,-43.90625 15.1155,5.5504 147.95841,96.61033 154.9375,106.28125 2.73856,6.31551 2.7093,12.82781 1.375,19.53125 l 94.65625,0 c -7.63111,-6.88319 -22.20287,-13.82388 -52.1875,-31.75 -20.9598,-36.9572 -34.58026,-62.48103 -93.59375,-127.625 -8.2016,-16.0261 -12.72375,-21.66143 -18.09375,-29.40625 -26.4362,-18.2775 -37.62714,-32.70425 -66.03125,-55.21875 z"
- id="path1805"
- inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/ourspolaire.svg b/src/activities/reversecount/resource/ourspolaire.svg
deleted file mode 100644
index 072936e87..000000000
--- a/src/activities/reversecount/resource/ourspolaire.svg
+++ /dev/null
@@ -1,738 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg602"
- sodipodi:version="0.32"
- width="336.57971"
- height="204.62843"
- xml:space="preserve"
- sodipodi:docname="ourspolaire.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.0"><metadata
- id="metadata116"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs604"><linearGradient
- id="linearGradient841"><stop
- style="stop-color:#e5edff;stop-opacity:0.498;"
- offset="0"
- id="stop842" /><stop
- style="stop-color:#d2ffde;stop-opacity:0.698;"
- offset="1"
- id="stop843" /></linearGradient><linearGradient
- id="linearGradient825"><stop
- style="stop-color:#d1edf7;stop-opacity:1;"
- offset="0"
- id="stop826" /><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="1"
- id="stop827" /></linearGradient><linearGradient
- id="linearGradient755"><stop
- style="stop-color:#ffffea;stop-opacity:1;"
- offset="0"
- id="stop756" /><stop
- style="stop-color:#bab2ba;stop-opacity:1;"
- offset="1"
- id="stop757" /></linearGradient><linearGradient
- id="linearGradient627"><stop
- style="stop-color:#ffedc2;stop-opacity:1;"
- offset="0"
- id="stop628" /><stop
- style="stop-color:#ddcab0;stop-opacity:1;"
- offset="1"
- id="stop629" /></linearGradient><linearGradient
- id="linearGradient621"><stop
- style="stop-color:#f8f8f8;stop-opacity:1;"
- offset="0"
- id="stop622" /><stop
- style="stop-color:#252726;stop-opacity:1;"
- offset="1"
- id="stop623" /></linearGradient><linearGradient
- id="linearGradient611"><stop
- style="stop-color:#000;stop-opacity:1;"
- offset="0"
- id="stop612" /><stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop613" /></linearGradient><linearGradient
- xlink:href="#linearGradient755"
- id="linearGradient614"
- x1="257.85315"
- y1="682.33966"
- x2="320.36124"
- y2="553.27771"
- gradientTransform="scale(1.0955897,0.9127504)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient611"
- id="radialGradient615"
- cx="269.29611"
- cy="624.37787"
- r="28.917383"
- fx="269.29611"
- fy="624.37787"
- spreadMethod="pad"
- gradientTransform="scale(1.0356058,0.9656184)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient755"
- id="radialGradient620"
- cx="351.07855"
- cy="438.41156"
- r="22.250706"
- fx="351.07855"
- fy="438.41156"
- gradientTransform="scale(0.7717729,1.295718)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient611"
- id="radialGradient713"
- cx="432.33527"
- cy="521.48029"
- r="21.761618"
- fx="432.33527"
- fy="521.48029"
- gradientTransform="scale(0.9186287,1.0885791)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient621"
- id="radialGradient723"
- cx="315.51892"
- cy="590.1037"
- r="2.7601602"
- fx="315.51892"
- fy="590.1037"
- gradientTransform="scale(1.0235332,0.9770078)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient611"
- id="radialGradient734"
- cx="166.32921"
- cy="290.09601"
- r="10.181284"
- fx="166.32921"
- fy="290.09601"
- gradientTransform="scale(0.6948075,1.4392476)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient755"
- id="linearGradient758"
- x1="413.42908"
- y1="503.23352"
- x2="324.4321"
- y2="464.20074"
- spreadMethod="pad"
- gradientTransform="scale(0.8142011,1.2281978)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient755"
- id="linearGradient907"
- x1="243.77563"
- y1="842.38367"
- x2="226.13997"
- y2="820.94659"
- gradientTransform="scale(1.2881886,0.7762838)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient627"
- id="linearGradient1032"
- x1="418.1116"
- y1="498.20596"
- x2="416.93024"
- y2="498.72147"
- gradientTransform="scale(0.8111421,1.2328296)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient621"
- id="linearGradient1226"
- x1="224.63075"
- y1="371.83194"
- x2="279.09796"
- y2="371.83194"
- spreadMethod="reflect"
- gradientTransform="scale(0.9079967,1.1013256)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient841"
- id="linearGradient2311"
- x1="75.292877"
- y1="885.46417"
- x2="312.4985"
- y2="885.46417"
- gradientTransform="scale(1.7696933,0.5650697)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2313"
- cx="434.29053"
- cy="1010.0573"
- fx="434.29053"
- fy="1010.0573"
- r="154.97861"
- gradientTransform="scale(1.5789719,0.6333235)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2315"
- cx="244.48337"
- cy="915.24231"
- fx="244.48337"
- fy="915.24231"
- r="154.85106"
- gradientTransform="scale(1.5802723,0.6328023)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2317"
- cx="105.18739"
- cy="1145.3701"
- fx="105.18739"
- fy="1145.3701"
- r="44.134876"
- gradientTransform="scale(2.3531015,0.424971)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2319"
- cx="121.06353"
- cy="1157.0901"
- fx="121.06353"
- fy="1157.0901"
- r="54.328083"
- gradientTransform="scale(2.5512675,0.391962)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient825"
- id="radialGradient2321"
- cx="296.36359"
- cy="683.57147"
- fx="296.36359"
- fy="683.57147"
- r="43.278053"
- gradientTransform="scale(1.261335,0.7928108)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2323"
- x1="139.40372"
- y1="841.53796"
- x2="357.4313"
- y2="841.53796"
- gradientTransform="scale(1.4303199,0.6991443)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2325"
- x1="300.24008"
- y1="673.59393"
- x2="359.59357"
- y2="741.91772"
- gradientTransform="scale(1.0203839,0.9800233)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="radialGradient2327"
- gradientTransform="scale(0.8188283,1.2212572)"
- cx="277.09235"
- cy="555.60541"
- fx="277.09235"
- fy="555.60541"
- r="88.593544"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2329"
- spreadMethod="pad"
- x1="718.37952"
- y1="516.23865"
- x2="728.68671"
- y2="510.32562"
- gradientTransform="scale(0.6716499,1.488871)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2331"
- spreadMethod="pad"
- x1="752.59528"
- y1="514.75446"
- x2="762.90247"
- y2="508.84146"
- gradientTransform="scale(0.6716499,1.488871)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2333"
- spreadMethod="pad"
- x1="651.54089"
- y1="542.96222"
- x2="662.40424"
- y2="536.73016"
- gradientTransform="scale(0.7073375,1.4137522)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2335"
- spreadMethod="pad"
- x1="608.95398"
- y1="551.65869"
- x2="620.01044"
- y2="545.31586"
- gradientTransform="scale(0.7262922,1.3768563)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2337"
- x1="339.45898"
- y1="966.55029"
- x2="351.88513"
- y2="1004.458"
- gradientTransform="scale(1.3272062,0.7534624)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2339"
- spreadMethod="pad"
- x1="357.81613"
- y1="516.48523"
- x2="368.6041"
- y2="510.29639"
- gradientTransform="scale(0.7010292,1.426474)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2341"
- spreadMethod="pad"
- x1="313.95786"
- y1="541.54443"
- x2="325.02661"
- y2="535.19458"
- gradientTransform="scale(0.7276732,1.3742432)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2343"
- spreadMethod="pad"
- x1="292.08444"
- y1="517.68097"
- x2="302.78754"
- y2="511.54086"
- gradientTransform="scale(0.6946899,1.4394913)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2345"
- spreadMethod="pad"
- x1="266.35193"
- y1="507.68127"
- x2="276.85019"
- y2="501.65863"
- gradientTransform="scale(0.6813617,1.4676492)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="linearGradient2347"
- spreadMethod="pad"
- x1="227.71634"
- y1="540.25806"
- x2="238.7851"
- y2="533.90814"
- gradientTransform="scale(0.7276732,1.3742432)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2349"
- x1="128.67809"
- y1="1016.6913"
- x2="141.77132"
- y2="1056.6342"
- gradientTransform="scale(1.3984569,0.7150739)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2351"
- x1="289.94205"
- y1="598.19434"
- x2="365.30142"
- y2="666.75946"
- gradientTransform="scale(0.8712213,1.147814)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient755"
- id="linearGradient2353"
- spreadMethod="pad"
- x1="323.81708"
- y1="647.07031"
- x2="310.3176"
- y2="622.33319"
- gradientTransform="scale(1.1078236,0.9026708)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="radialGradient2355"
- gradientTransform="scale(1.0235332,0.9770078)"
- cx="315.51892"
- cy="590.1037"
- fx="315.51892"
- fy="590.1037"
- r="2.7601602"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient611"
- id="radialGradient2357"
- gradientTransform="scale(0.7468698,1.3389214)"
- cx="354.37497"
- cy="414.33463"
- fx="354.37497"
- fy="414.33463"
- r="18.112698"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="linearGradient2359"
- spreadMethod="reflect"
- x1="42.517784"
- y1="658.5694"
- x2="132.03745"
- y2="658.5694"
- gradientTransform="scale(1.6880719,0.5923918)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="linearGradient2361"
- spreadMethod="reflect"
- x1="219.90593"
- y1="339.05179"
- x2="235.50734"
- y2="339.05179"
- gradientTransform="scale(0.7874417,1.2699353)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="linearGradient2363"
- spreadMethod="reflect"
- x1="264.19641"
- y1="193.48457"
- x2="278.21954"
- y2="193.48457"
- gradientTransform="scale(0.4794138,2.0858806)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient621"
- id="linearGradient2365"
- spreadMethod="reflect"
- x1="110.5767"
- y1="497.40347"
- x2="129.15443"
- y2="497.40347"
- gradientTransform="scale(1.1399771,0.8772106)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient627"
- id="linearGradient2367"
- gradientTransform="scale(0.8229543,1.2151343)"
- x1="357.03064"
- y1="531.31152"
- x2="355.84546"
- y2="531.82874"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="0.37724654"
- inkscape:cx="203.35528"
- inkscape:cy="263.22248"
- inkscape:window-width="822"
- inkscape:window-height="592"
- inkscape:window-x="3"
- inkscape:window-y="25"
- inkscape:current-layer="g2251"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="0" /><g
- id="g2251"
- transform="matrix(0.8,0,0,0.8,-128.73321,-455.16328)"><g
- transform="matrix(0.84274,0,0,0.850105,22.49033,123.6241)"
- id="g1623"><g
- style="font-size:12px"
- transform="matrix(-0.937932,-0.04997885,-0.06140859,0.546284,1129.832,425.5443)"
- id="g844"><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="ccscccssssccssssc"
- id="path808"
- d="m 133.2453,533.6385 c 5.5681,34.522 3.3747,28.8354 2.261,49.9939 8.3522,6.6817 8.3587,9.7118 27.7892,11.1023 l 63.3029,4.5299 72.7521,19.885 70.3898,4.53 57.397,9.2546 c 21.4051,3.4513 43.2459,1.2613 60.3377,-12.1228 12.7171,-10.6976 16.0188,-14.1161 28.7902,-21.2051 13.3091,-8.6185 21.9494,-36.5789 32.3335,-49.5531 1.9919,-2.4889 3.7393,-10.95 4.4278,-22.3305 l -5.3327,-27.3737 c 8.3192,12.2125 -0.032,8.6775 -4.9887,15.0533 l -55.7787,71.749 c -10.0825,12.9692 -37.1728,15.6215 -44.13,14.4011 L 151.1727,550.402 c -10.1569,-1.7815 -13.043,-7.3735 -17.9274,-16.7635 z"
- style="font-size:12px;fill:url(#linearGradient2311);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- style="fill:url(#radialGradient2313)"
- id="g828"><path
- sodipodi:nodetypes="cssssssssssssssss"
- id="path617"
- d="m 623.051,558.1809 c 0,15.568 -7.0191,19.9901 -10.3755,32.0402 -3.3565,12.05 -17.2242,18.7352 -26.1969,27.018 -8.9726,8.2828 -15.7042,24.2113 -29.8988,34.2407 -23.9356,16.0777 -12.2147,15.9108 -55.7354,13.5484 -26.9426,-1.5032 -69.3756,-10.3159 -100.6566,-7.864 -32.5148,1.3207 -84.5245,-23.6695 -95.4165,-28.1135 -29.042,-8.6998 -54.9636,0.983 -76.3594,-0.811 -21.3322,-0.6076 -32.8545,-7.2443 -32.8545,-22.8123 0,-15.568 16.6899,-39.2577 22.7593,-50.1266 6.0694,-10.8689 20.417,-27.8155 29.9064,-34.6218 9.4894,-6.8064 4.6714,-16.4651 14.9313,-19.8454 10.2601,-3.3802 20.2271,-5.6568 28.6241,-5.797 26.9684,-0.4504 49.0001,3.7456 84.5628,5.0219 35.5625,1.2762 79.9474,20.1629 113.8722,24.4593 33.9248,4.2963 64.4766,3.4517 86.5471,12.5119 22.0706,9.0603 46.2904,5.5832 46.2904,21.1512 z"
- style="font-size:12px;fill:url(#radialGradient2315);fill-rule:evenodd"
- transform="translate(299.3822,60.66899)"
- inkscape:connector-curvature="0" /><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="csccc"
- id="path622"
- d="m 259.8558,470.6394 c 0.2953,4.8109 101.675,22.8503 86.5853,30.6898 -11.7556,4.8107 -109.2553,-5.2947 -125.5638,-7.657 -32.6169,0 -33.0725,15.1098 -54.3334,7.6774 7.087,-10.9758 42.5219,-10.9759 93.3119,-30.7102 z"
- style="font-size:12px;fill:url(#radialGradient2317);fill-opacity:0.38670002;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="ccccc"
- id="path812"
- d="m 442.9361,470.6393 c -29.5291,3.8003 -43.3636,2.9529 -112.2105,-15.9457 -53.4917,0 -129.928,-1.515 -129.928,-13.5834 0,-12.0681 50.4507,-1.7717 103.9424,-1.7717 46.4046,7.087 100.3989,23.9573 138.1961,31.3008 z"
- style="font-size:12px;fill:url(#radialGradient2319);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="translate(368.4568,120.1445)"
- sodipodi:nodetypes="ccccc"
- id="path649"
- d="m 414.393,546.905 c -4.7811,2.0921 -16.5739,52.7595 -74.3538,5.2466 8.942,-10.741 -12.8739,-35.4109 -8.0929,-37.5029 41.2815,-6.7084 77.6712,3.4554 90.3585,12.0335 11.5062,26.2957 -3.1308,18.1308 -7.9118,20.2228 z"
- style="font-size:12px;fill:url(#radialGradient2321);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g></g><path
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- sodipodi:nodetypes="csccssccssccscc"
- id="path884"
- d="m 554.0083,756.0596 c 15.516,4.8261 127.9361,54.4166 94.968,72.6343 -39.2916,21.9575 -145.2498,11.5714 -153.7672,22.0727 -28.9591,25.3155 -130.8893,18.8688 -246.1376,18.8688 -57.6242,0 -77.3359,-48.3996 -91.2439,-67.5742 -12.1664,-17.1208 -42.7505,-14.0991 -68.04584,-20.9998 -20.43013,-5.8522 11.43254,-19.6529 45.36254,-29.2513 l 2.2881,-4.2669 c -34.2608,4.6305 -85.13487,29.2521 -62.98195,36.9544 28.90905,9.3572 60.41615,7.9309 74.74765,26.0329 16.43,19.9157 36.7824,68.9225 98.1699,68.9225 126.1818,-6.8723 220.5855,16.3528 259.7655,-25.2501 11.9244,-11.3825 120.0621,0.4577 151.1749,-23.227 31.3817,-24.1351 -89.1623,-73.7644 -109.277,-78.6501 l 4.9769,3.7338 z"
- style="font-size:12px;fill:#defff4;fill-opacity:0.75690002;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- id="g1575"><g
- style="font-size:12px"
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- id="g1372"><path
- sodipodi:nodetypes="ccsccsscccssc"
- id="path900"
- d="m 322.8978,628.4386 c 8.9568,0.8329 21.2416,10.615 36.2593,6.4675 9.3841,-2.3437 12.552,-11.8128 21.5281,-25.5365 1.6816,-2.454 3.7765,-8.7005 22.6415,-21.013 5.7605,31.8246 55.404,59.5894 107.9145,141.6833 -30.7923,-2.4427 -55.0295,-13.0941 -67.0972,-1.5739 -17.0715,17.5849 -74.4325,9.3022 -104.8844,11.1269 -30.452,1.8246 -76.0506,1.3074 -98.3265,0.1404 -4.6215,-21.9655 -15.6135,-27.5539 -41.5411,-32.1417 70.4575,-6.5958 72.649,-61.5557 76.3628,-75.9307 16.2992,1.7677 4.0756,-13.6853 9.3119,-13.0185 2.6741,0.4201 3.7785,5.2867 7.8106,6.8919 9.0671,2.9846 25.2035,2.3871 30.0205,2.9043 z"
- style="font-size:12px;fill:url(#linearGradient2323);fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccccccccccccccccccsssssssssssssssc"
- id="path1273"
- d="m 294.2482,682.4463 c 1.195,3.0379 7.2184,9.8049 9.3271,13.3772 2.9006,4.9144 6.1027,10.4452 9.6763,14.8967 0.3389,0.4222 -0.0222,-1.0824 -0.0369,-1.6235 -0.1009,-3.6857 0.0252,-7.3162 -0.2131,-11.0156 -0.0194,-0.3017 0.5611,1.1446 1.1363,2.6482 4.0129,10.4873 5.5688,15.1574 14.5695,23.0978 2.7066,2.3876 -0.2352,-6.8659 -0.7953,-11.3381 -0.1887,-1.5076 0.7848,1.3476 2.5481,3.5465 1.6575,2.0673 11.0363,10.87 12.9751,10.5198 0.4552,-0.0822 1.2737,-4.311 1.424,-4.8184 1.566,-5.2838 2.0782,-9.9306 1.4885,-15.4016 -0.131,-1.2144 0.8232,2.6312 1.866,4.3283 9.5718,15.5797 4.3449,-12.4363 4.9419,-14.059 7.2077,5.7155 8.9003,8.8779 8.5337,0.6217 -0.3008,-6.7718 -2.0192,-13.4609 -3.4477,-20.0618 -0.73,-3.374 3.2187,3.4713 4.6199,4.8246 5.6889,5.493 -2.4924,-15.5584 -2.9419,-19.1201 -0.2482,-1.9646 6.0315,7.6226 5.0326,3.206 -2.0131,-5.6952 -3.0066,-6.7423 -6.8135,-7.5205 -0.1805,0.0597 -0.6696,0.4226 -1.4035,1.0184 -0.7338,0.5958 3.2936,12.0688 2.134,13.0603 -1.1595,0.9915 -7.5061,-8.4984 -8.9639,-7.2517 -1.4578,1.2469 1.9493,17.3348 0.3207,18.6964 -1.6286,1.3617 -9.0514,-8.1009 -10.7233,-6.7648 -1.6719,1.3362 3.2536,13.9572 1.666,15.1274 -1.5877,1.1702 -8.9303,-13.0124 -10.3062,-12.1484 -1.3759,0.8638 8.7811,23.4304 7.7443,23.8475 -0.9048,0.3637 -13.3127,-21.1788 -14.4144,-20.8566 -1.1018,0.3221 0.0298,5.2737 -1.232,5.5325 -1.2621,0.2587 -4.9177,-4.1755 -6.3029,-4.002 -1.3854,0.1735 8.3538,20.8014 6.8821,20.8679 -1.4717,0.0665 -14.1544,-20.4285 -15.6759,-20.491 -1.5212,-0.0623 3.1686,9.8055 1.6345,9.5923 -1.5341,-0.2132 -9.2922,-10.5074 -10.8023,-10.893 -1.51,-0.3857 -2.9987,-0.8633 -4.4478,-1.4434 z"
- style="font-size:12px;fill:url(#linearGradient2325);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccssssssssssssssscs"
- id="path1210"
- d="m 237.1764,733.1216 c 3.0062,18.6716 11.1533,47.7307 -16.6336,47.7307 -27.7868,0 -52.3724,-6.2183 -52.3724,-24.3402 0,-0.5663 -0.0229,-1.1928 -0.0664,-1.875 -0.0435,-0.6823 -0.3729,-3.8407 -0.4896,-4.729 -0.1167,-0.8883 -0.2494,-1.8238 -0.3959,-2.8022 -0.1465,-0.9784 -1.978,3.939 -2.1498,2.8791 -0.1718,-1.0599 1.3163,-8.097 1.1238,-9.2297 -0.1924,-1.1327 -2.0653,3.639 -2.2739,2.442 -0.2085,-1.1969 1.2472,-8.3625 1.0271,-9.615 -0.2201,-1.2525 -2.1162,3.408 -2.3433,2.1085 -0.2272,-1.2995 1.2145,-8.559 0.9849,-9.8969 -0.2297,-1.3378 -2.1307,3.246 -2.3582,1.8784 -0.2276,-1.3676 1.2183,-8.6865 0.9974,-10.0752 -0.2209,-1.3887 -2.1086,3.1528 -2.3183,1.7517 -0.2097,-1.4012 1.2585,-8.7452 1.0646,-10.1501 -0.194,-1.4051 -2.0502,3.1288 -2.2238,1.7285 -0.1737,-1.4003 1.3352,-8.7347 1.1864,-10.1215 -2.3808,-22.1902 -1.2882,-42.1151 12.6052,-42.1151 19.4692,2.4643 61.5689,55.3823 64.6358,74.431 z"
- style="font-size:12px;fill:url(#radialGradient2327);fill-rule:evenodd"
- transform="matrix(0.971693,-0.270953,0.236248,1.114436,101.165,-48.08643)"
- inkscape:connector-curvature="0" /><g
- style="font-size:12px"
- id="g1252"><path
- sodipodi:nodetypes="ccccc"
- id="path1249"
- d="m 476.51,767.576 c 2.477,6.6307 4.1062,12.1476 6.9555,11.5549 -1.9345,-23.8096 5.1703,-17.0207 2.6934,-23.6513 -2.4822,-1.4392 -4.6043,-1.5824 -7.2098,-1.0808 -4.645,1.7352 -3.899,8.5254 -2.4391,13.1772 z"
- style="font-size:12px;fill:url(#linearGradient2329);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1248"
- d="m 499.491,765.3663 c 2.477,6.6307 4.1062,12.1476 6.9555,11.5549 -1.9345,-23.8096 5.1703,-17.0207 2.6934,-23.6513 -2.4822,-1.4392 -4.6043,-1.5824 -7.2098,-1.0808 -4.645,1.7352 -3.899,8.5254 -2.4391,13.1772 z"
- style="font-size:12px;fill:url(#linearGradient2331);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1250"
- d="m 452.9972,765.2222 c 0.6752,7.046 0.82,12.7965 3.7255,12.962 4.298,-23.4982 9.4021,-15.1008 8.727,-22.1467 -2.0247,-2.033 -4.0374,-2.7209 -6.6839,-2.9112 -4.9359,0.4729 -5.9739,7.2247 -5.7686,12.0959 z"
- style="font-size:12px;fill:url(#linearGradient2333);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1251"
- d="m 434.037,756.8299 c 0.1517,7.0765 -0.1296,12.8221 2.7557,13.2021 6.0257,-23.1155 10.4942,-14.3634 10.3425,-21.4398 -1.8687,-2.1773 -3.8249,-3.0124 -6.45,-3.398 -4.9574,0.1063 -6.4924,6.7625 -6.6482,11.6357 z"
- style="font-size:12px;fill:url(#linearGradient2335);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccsscsscccssccc"
- id="path1209"
- d="m 433.1944,757.0492 c 0,2.2653 -0.4973,5.2685 1.1822,6.1204 1.7534,-6.0872 -1.5209,-0.9143 3.2234,5.4017 4.7753,6.4685 17.6113,6.0517 17.3988,1.4339 -0.4105,-8.6225 4.4036,-16.8824 9.1238,-16.5082 -6.6793,1.468 -11.4992,14.3272 -5.0522,19.4958 3.0356,2.4879 17.4056,1.3967 18.2176,1.0084 4.6736,-2.3908 2.6284,-14.3544 5.6788,-17.343 -2.0373,2.5979 -4.6613,18.6723 4.6917,18.9848 23.2857,1.25 14.8239,-11.5672 17.217,-15.391 -0.2804,4.2066 -3.6288,16.7181 3.4269,11.2491 4.0256,-3.0926 9.6704,2.2459 11.9635,-1.6798 2.2931,-3.9256 3.5612,-8.2416 3.5612,-12.7721 0,-18.1218 -20.2888,-32.8125 -45.3163,-32.8125 -25.0276,0 -45.3164,14.6907 -45.3164,32.8125 z"
- style="font-size:12px;fill:url(#linearGradient2337);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><g
- style="font-size:12px"
- transform="matrix(0.830457,0,0,0.887216,30.04368,85.24243)"
- id="g1264"><path
- sodipodi:nodetypes="ccccc"
- id="path1258"
- d="m 255.3464,734.4998 c -0.8866,7.0225 -1.2041,12.7662 -4.1134,12.8442 -3.59,-23.6167 -8.9441,-15.3765 -8.0576,-22.3989 2.085,-1.9712 4.1173,-2.5984 6.7684,-2.7091 4.9194,0.6211 5.7541,7.401 5.4026,12.2638 z"
- style="font-size:12px;fill:url(#linearGradient2339);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1238"
- d="m 233.3338,741.467 c -0.1165,7.0773 0.1935,12.8213 -2.69,13.2158 -6.1408,-23.0852 -10.5656,-14.3109 -10.4492,-21.3881 1.8579,-2.1866 3.8099,-3.0313 6.433,-3.4301 4.9579,0.0816 6.5261,6.7302 6.7062,11.6024 z"
- style="font-size:12px;fill:url(#linearGradient2341);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1239"
- d="m 207.2537,743.1089 c -1.1323,6.9871 -1.651,12.7161 -4.5613,12.6921 -2.7596,-23.7281 -8.3994,-15.6807 -7.2671,-22.6677 2.1528,-1.8969 4.206,-2.4523 6.8591,-2.47 4.8948,0.7932 5.4913,7.5981 4.9693,12.4456 z"
- style="font-size:12px;fill:url(#linearGradient2343);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1240"
- d="m 174.6683,743.4897 c 1.7911,6.8479 2.8517,12.5016 5.7465,12.2012 0.4926,-23.8829 6.8715,-16.4078 5.0805,-23.2556 -2.3233,-1.6838 -4.4199,-2.0416 -7.0628,-1.8072 -4.7972,1.2548 -4.7444,8.0856 -3.7642,12.8616 z"
- style="font-size:12px;fill:url(#linearGradient2345);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1241"
- d="m 157.4367,739.6992 c 0.1165,7.0773 -0.1935,12.8213 2.69,13.2158 6.1408,-23.0852 10.5656,-14.3109 10.4492,-21.3881 -1.8579,-2.1866 -3.8099,-3.0313 -6.433,-3.4301 -4.9579,0.0816 -6.5261,6.7302 -6.7062,11.6024 z"
- style="font-size:12px;fill:url(#linearGradient2347);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccsscsscccssccc"
- id="path1208"
- d="m 261.2503,755.7993 c 0,2.2653 0.5521,5.2685 -1.3125,6.1204 -1.9467,-6.0872 1.6886,-0.9143 -3.5788,5.4017 -5.3018,6.4685 -19.553,6.0517 -19.3171,1.4339 0.4558,-8.6225 -4.889,-16.8824 -10.1297,-16.5082 7.4157,1.468 12.767,14.3272 5.6092,19.4958 -3.3702,2.4879 -19.3245,1.3967 -20.2261,1.0084 -5.1888,-2.3908 -2.9182,-14.3544 -6.3049,-17.343 2.2619,2.5979 5.1752,18.6723 -5.2089,18.9848 -25.853,1.25 -16.4583,-11.5672 -19.1152,-15.391 0.3113,4.2066 4.0288,16.7181 -3.8048,11.2491 -4.4694,-3.0926 -10.7365,2.2459 -13.2825,-1.6798 -2.5459,-3.9256 -3.9538,-8.2416 -3.9538,-12.7721 0,-18.1218 22.5257,-32.8125 50.3125,-32.8125 27.7869,0 50.3126,14.6907 50.3126,32.8125 z"
- style="font-size:12px;fill:url(#linearGradient2349);fill-rule:evenodd"
- transform="translate(-5,-21.25003)"
- inkscape:connector-curvature="0" /></g><path
- sodipodi:nodetypes="cccccccccc"
- id="path1271"
- d="m 258.5002,738.4424 c 1.7897,-3.945 3.1486,-11.4124 5.2941,-16.2926 -0.9097,6.0556 3.6224,12.8963 5.8673,3.9073 1.6265,-6.5139 2.6589,-22.0786 2.5071,-0.9312 -0.0573,7.9956 6.355,-14.031 6.329,-18.6068 -0.1074,-19.1277 0.9707,1.7189 4.466,6.1886 1.3063,-4.3787 2.2452,-12.4892 2.2381,-15.3091 -0.0106,-4.2402 2.2778,-17.7475 -1.3305,-20.3812 -1.8028,7.7433 -19.7887,42.2065 -44.5869,33.009 12.2203,4.4894 16.2707,16.3941 19.2158,28.416 z"
- style="font-size:12px;fill:url(#linearGradient2351);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><g
- transform="translate(0.417595,-3.051758e-5)"
- id="g1546"><g
- style="font-size:12px"
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- id="g1202"><path
- transform="matrix(1,0,0,1.242969,0,-142.1379)"
- sodipodi:ry="14.584167"
- sodipodi:rx="17.898758"
- sodipodi:cy="570.42133"
- sodipodi:cx="328.14404"
- d="m 346.0428,570.42133 a 17.898758,14.584167 0 0 1 -17.89876,14.58416 17.898758,14.584167 0 0 1 -17.89875,-14.58416 17.898758,14.584167 0 0 1 17.89875,-14.58417 17.898758,14.584167 0 0 1 17.89876,14.58417 z"
- id="path936"
- style="font-size:12px;fill:url(#linearGradient2353);fill-rule:evenodd;stroke-width:1"
- sodipodi:type="arc" /><path
- sodipodi:nodetypes="ccccc"
- id="path898"
- d="m 288.1254,558.6117 c 0,21.7461 -12.6303,27.0267 -20.3884,38.2767 -1.9059,-5.0444 -1.7325,-15.4767 -0.2237,-19.5267 -13.75,-8.6212 -19.9588,-38.75 -5.3255,-38.125 20.8833,0 24.0626,15.7538 25.9376,19.375 z"
- style="font-size:12px;fill:url(#radialGradient620);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><g
- style="font-size:12px"
- id="g1034"><g
- transform="translate(0,-1.325867)"
- id="g927"><path
- sodipodi:ry="8.8388977"
- sodipodi:rx="7.2920837"
- sodipodi:cy="571.08496"
- sodipodi:cx="324.16605"
- d="m 331.45813,571.08496 a 7.2920837,8.8388977 0 0 1 -7.29208,8.8389 7.2920837,8.8388977 0 0 1 -7.29209,-8.8389 7.2920837,8.8388977 0 0 1 7.29209,-8.8389 7.2920837,8.8388977 0 0 1 7.29208,8.8389 z"
- id="path921"
- style="fill:#f6f6f6;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="translate(-0.441933,-3.535645)"
- sodipodi:ry="4.6404114"
- sodipodi:rx="4.8613892"
- sodipodi:cy="576.60925"
- sodipodi:cx="323.94507"
- d="m 328.80646,576.60925 a 4.8613892,4.6404114 0 0 1 -4.86139,4.64041 4.8613892,4.6404114 0 0 1 -4.86139,-4.64041 4.8613892,4.6404114 0 0 1 4.86139,-4.64041 4.8613892,4.6404114 0 0 1 4.86139,4.64041 z"
- id="path922"
- style="fill:url(#radialGradient2355);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /></g><g
- id="g1031"><path
- sodipodi:nodetypes="ccccc"
- id="path935"
- d="m 331.4581,571.085 c 0,4.8815 -4.2022,6.4951 -8.2296,6.4951 -4.0273,0 -6.3545,-1.6136 -6.3545,-6.4951 0,-4.8816 3.7066,-8.176 7.071,-7.5131 4.0274,1.1049 7.5131,2.6315 7.5131,7.5131 z"
- style="font-size:12px;fill:#f6f6f6;fill-rule:evenodd"
- transform="translate(-41.54276,-2.209732)"
- inkscape:connector-curvature="0" /><path
- transform="translate(-41.98469,-5.745377)"
- sodipodi:ry="4.6404114"
- sodipodi:rx="4.8613892"
- sodipodi:cy="576.60925"
- sodipodi:cx="323.94507"
- d="m 328.80646,576.60925 a 4.8613892,4.6404114 0 0 1 -4.86139,4.64041 4.8613892,4.6404114 0 0 1 -4.86139,-4.64041 4.8613892,4.6404114 0 0 1 4.86139,-4.64041 4.8613892,4.6404114 0 0 1 4.86139,4.64041 z"
- id="path932"
- style="font-size:12px;fill:url(#radialGradient723);fill-rule:evenodd;stroke-width:1"
- sodipodi:type="arc" /></g></g><path
- sodipodi:nodetypes="ccccc"
- id="path919"
- d="m 258.5219,544.5178 c -1.6857,7.714 1.4528,21.327 5.1874,22.1431 3.7344,0.8161 3.5092,0.9857 5.1949,-6.7283 1.6857,-7.714 4.8215,-12.2786 1.087,-13.0947 -3.7346,-0.8161 -9.2389,-7.6636 -11.4693,-2.3201 z"
- style="font-size:12px;fill:url(#radialGradient2357);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g><g
- id="g1535"><path
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- sodipodi:nodetypes="cscscsccscscscscsccc"
- id="path1203"
- d="m 334.3779,627.5148 c 0,1.3484 -0.3833,2.8163 -1.0901,4.3526 -0.7066,1.5363 -2.8508,9.7038 -4.1441,11.3261 -1.2934,1.6225 -1.7362,-3.3 -3.4964,-1.6933 -1.7601,1.6067 -1.4957,4.4302 -6.5733,8.1067 -2.107,1.489 -0.644,-4.606 -5.9484,0.726 -0.9234,0.8738 -2.3896,4.2092 -4.6726,5.6868 -1.5405,-4.4599 -5.3831,1.0975 -5.1181,3.2905 -6.8965,0.3233 -6.6926,-3.8915 -9.1886,-3.702 -2.7988,0.2125 -1.8479,0.8131 -2.2854,4.5631 -4.5223,0 -3.102,-4.4622 -6.5107,-4.0357 -3.2657,0.3684 -1.5305,3.1073 -2.9094,2.3935 -1.3788,-0.714 -4.4139,-5.6374 -5.4203,-6.6141 -1.0066,-0.9766 0.0154,2.931 -0.6759,1.7544 -0.6912,-1.1765 -3.0957,-7.4374 -3.5287,-8.7511 -0.4329,-1.3137 0.363,2.3196 0.1313,0.9316 -0.2316,-1.3882 -1.4908,-7.7977 -1.5781,-9.1973 -0.0873,-1.3996 -0.1168,-2.7893 -0.1168,-4.1377 0,-10.7869 2.2541,-7.0313 20.6086,-7.0313 18.3545,0 42.517,-8.7557 42.517,2.0312 z"
- style="font-size:12px;fill:url(#linearGradient907);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- sodipodi:nodetypes="cscccc"
- id="path1201"
- d="m 307.6477,634.0451 c -1.7678,5.2477 -11.2057,18.2875 -14.9319,15.5179 -5.7708,-3.6322 -7.3745,-1.2998 -12.134,-1.2998 -7.0191,0.3125 -5.799,-6.9457 -5.799,-17.4411 0,-10.4954 2.6095,-6.7456 12.1286,-6.7456 9.5191,0 26.0396,-0.5268 20.7363,9.9686 z"
- style="font-size:12px;fill:#333333;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.528691,0.0426828,-0.143181,0.403416,335.222,445.2067)"
- sodipodi:nodetypes="ccccc"
- id="path859"
- d="m 91.26164,437.5162 c -1.75503,4.6848 -10.08432,3.2175 -18.86659,0.2925 -0.29964,-2.9251 6.87387,0.005 6.87387,-4.68 0,-2.3449 -4.83346,-4.3877 -6.28886,-9.3603 11.41481,5.8501 19.45161,11.403 18.28158,13.7478 z"
- style="font-size:12px;fill:#ab8080;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.528691,0.0426828,-0.143181,0.403416,335.222,445.2067)"
- sodipodi:nodetypes="csccccc"
- id="path852"
- d="m 222.8887,433.7143 c -25.448,-3.535 -53.3547,-0.2926 -95.3565,5.5575 -20.8718,2.3256 -36.68789,4.8014 -46.25184,3.5567 -4.78197,-0.6224 -7.8995,-2.2287 -9.50728,-5.1415 22.47906,6.9787 28.82782,-1.4969 0.76816,-13.6254 16.54657,-20.1492 26.22623,-33.9305 54.99096,-33.9305 23.2815,0 57.0383,9.9703 95.3565,43.5832 z"
- style="font-size:12px;fill:url(#linearGradient2359);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccsc"
- id="path856"
- d="m 185.4483,440.1489 c 0,5.6541 -2.7502,10.2377 -6.1426,10.2377 -3.3925,0 -6.1426,-4.5836 -6.1426,-10.2377 0,-5.6541 1.7869,-10.9019 5.4784,-9.2744 2.863,1.8196 6.8068,3.6203 6.8068,9.2744 z"
- style="font-size:12px;fill:url(#linearGradient2361);fill-rule:evenodd"
- transform="matrix(0.516514,-0.193895,0.182286,0.35633,195.4983,507.2462)"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.681982,0.09227997,-0.205179,0.396738,339.5629,442.0069)"
- sodipodi:nodetypes="ccccc"
- id="path857"
- d="m 133.3823,416.456 c 0,8.0773 -3.9421,14.0403 -5.85,16.3803 -1.6155,0 3.51,-8.303 3.51,-16.3803 0,-8.0773 -5.7105,-12.8703 -4.095,-12.8703 3.6629,0.585 6.435,4.793 6.435,12.8703 z"
- style="font-size:12px;fill:url(#linearGradient2363);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.528691,0.0426828,-0.143181,0.403416,335.222,445.2067)"
- sodipodi:nodetypes="cccsc"
- id="path858"
- d="m 141.9884,438.7913 c 4.9369,4.3821 6.6013,8.9745 4.0781,12.0612 -2.5232,3.0869 -8.5709,2.0366 -13.5078,-2.3456 -4.937,-4.3821 -9.4777,-12.4402 -4.0235,-12.1728 5.8803,0.3046 9.1013,0.7076 13.4532,2.4572 z"
- style="font-size:12px;fill:url(#linearGradient2365);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.528691,0.0426828,-0.143181,0.403416,335.222,445.2067)"
- sodipodi:ry="8.482666"
- sodipodi:rx="4.0950699"
- sodipodi:cy="417.91852"
- sodipodi:cx="115.83204"
- d="m 119.92711,417.91852 a 4.0950699,8.482666 0 0 1 -4.09507,8.48266 4.0950699,8.482666 0 0 1 -4.09507,-8.48266 4.0950699,8.482666 0 0 1 4.09507,-8.48267 4.0950699,8.482666 0 0 1 4.09507,8.48267 z"
- id="path854"
- style="font-size:12px;fill:url(#radialGradient734);fill-rule:evenodd"
- sodipodi:type="arc" /><path
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- sodipodi:nodetypes="cccc"
- id="path1205"
- d="m 296.5653,647.2022 c 0,2.33 -5.0001,2.4862 -5.3126,0.1563 -0.3125,-2.33 0.7578,-6.4063 1.875,-6.25 1.2735,0 2.3438,3.295 3.4376,6.0937 z"
- style="font-size:12px;fill:url(#linearGradient2367);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="cccc"
- id="path1207"
- d="m 336.5716,611.0863 c 0.3592,-2.3021 5.3236,-1.6857 5.2733,0.6646 -0.0504,2.3503 -1.7364,6.2129 -2.8161,5.8862 -1.2583,-0.1963 -1.8079,-3.6169 -2.4572,-6.5508 z"
- style="font-size:12px;fill:url(#linearGradient1032);fill-rule:evenodd;stroke-width:1"
- inkscape:connector-curvature="0" /></g><g
- style="font-size:12px"
- transform="matrix(0.839828,0,0,0.845163,106.2727,81.11203)"
- id="g1213"><path
- sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
- id="path926"
- d="m 339.3754,570.7991 c 0,5.0051 4.7865,2.1875 -7.8125,2.1875 -12.599,0 -15.3125,5.9426 -15.3125,0.9375 0,-5.005 -6.136,-20.2658 6.4631,-19.3512 12.599,1.2195 16.6619,11.2212 16.6619,16.2262 z m 46.8781,-24.2287 c 2.7672,2.8728 22.6159,-1.976 25.3313,10.1689 5.7577,27.7286 -14.0804,34.4019 -21.0383,42.5426 -3.8931,4.8639 -8.305,17.2359 -12.0429,22.9353 2.3454,-3.3501 2.1843,-11.0784 1.7097,-10.37 -1.3607,1.9223 -3.4591,13.5976 -3.9481,14.2949 -0.4891,0.6973 -0.3431,-6.4111 -0.8638,-5.7402 -1.3878,1.8988 -1.641,9.4841 -2.1625,10.1498 -0.5215,0.6656 -0.7168,-5.221 -1.2817,-4.5975 -1.0941,1.0856 -1.4067,7.8378 -1.9713,8.4553 -0.5647,0.6176 -0.677,-5.1862 -1.4191,-4.7542 -1.7456,1.2758 -2.1313,8.0334 -2.7497,8.5863 -0.34,0.3341 0.0609,-6.3639 -1.8554,-4.986 -1.2716,1.0335 -1.5244,7.1405 -2.2003,7.4124 -0.6757,0.2719 -0.2046,-6.4894 -1.8379,-5.7826 -1.7666,0.6449 -1.8585,7.0456 -2.6769,7.2676 -0.8184,0.2219 -0.3836,-6.5563 -2.2172,-5.9377 -2.1613,0.8291 -1.1251,6.9371 -2.0212,7.1023 -0.8961,0.1651 -1.4337,-6.3554 -3.3392,-6.1132 -2.5691,0.3466 -1.1994,6.8151 -2.1084,6.9166 -0.9088,0.1016 -1.7725,-6.2964 -3.3288,-6.3089 -3.3219,-0.031 -1.144,6.3669 -2.0008,6.398 -0.8568,0.0312 -2.3175,-6.2096 -3.1239,-6.2127 -1.8008,-0.007 -0.6461,6.5301 -1.3858,6.484 -0.7399,-0.046 -0.8509,-6.4191 -3.0367,-6.7619 -1.2123,-0.1728 -0.956,6.3673 -1.5138,6.2373 -0.5579,-0.13 -1.8134,-11.936 -3.6922,-12.3315 -0.6023,-0.1999 1.4523,7.6263 0.8153,7.4453 -0.637,-0.181 -2.0874,-7.9273 -4.6332,-8.5321 -0.6677,-0.1629 -0.3553,6.6435 -1.0496,6.4978 -1.9443,-2.0207 0.0355,-6.9121 -3.1119,-7.3728 -0.7169,-0.1294 -0.7809,4.9422 -1.5161,4.8283 -0.7352,-0.1137 0.499,-3.2522 -1.7974,-3.7933 -0.7339,-0.1817 0.7391,4.7806 -0.0207,4.6953 -0.7598,-0.0854 -4.1584,-1.3414 -6.5654,-1.9271 -3.6115,-0.959 -0.6242,3.3703 -1.7466,2.7552 -1.4339,-0.8565 -4.9443,-3.2372 -6.0806,-3.2453 -1.7613,-0.0115 -0.0546,2.6557 -1.2108,2.6693 -1.1561,0.0136 -3.4562,-2.6261 -5.8872,-2.6261 -7.8017,0.625 -11.9241,-14.0275 -12.3874,-13.8521 -0.4788,0.067 5.3513,8.4079 2.3949,11.2033 -1.4611,1.2741 -3.2782,2.0645 -5.0595,2.3528 -1.7812,0.2882 -3.5266,0.0743 -4.8444,-0.6603 -1.4594,-0.7868 -4.5173,-3.781 -4.2841,0.6255 -1.0272,-1.3344 -1.4941,-3.3938 -1.8036,-5.0924 -0.1548,-0.8493 0.1717,2.5072 -0.2862,1.9464 -0.7893,-1.6657 -0.3743,-5.5915 -0.5732,-6.2001 -1.5907,-4.8691 -2.3346,-12.3296 -1.8658,-24.2682 -0.6251,-13.9698 14.9021,-15.1102 18.9036,-35.4245 4.0017,-20.3143 -17.8972,3.9474 -13.9991,-9.8436 4.4138,-18.597 6.3342,-14.1514 13.908,-20.6595 13.2568,-10.2292 24.9988,-9.4809 46.3749,-9.1217 15.8423,0.2662 41.181,-2.1403 53.101,22.545 z"
- style="font-size:12px;fill:url(#linearGradient614);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccsss"
- id="path904"
- d="m 296.3954,602.6742 c -2.1005,15.0629 -14.7858,5.3126 -11.0669,18.8827 -10.3626,-13.8702 -12.8282,-8.8123 -14.7032,-13.8827 -1.3957,-5.6614 -2.1472,-11.5234 7.5,-10.9375 10.29,0 19.2253,-0.9114 18.2701,5.9375 z"
- style="font-size:12px;fill:url(#radialGradient615);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path918"
- d="m 320.8503,594.5098 c -9.2808,-2.3008 -8.1789,5.3032 -16.7938,23.8648 1.5496,-20.7713 -4.4195,-22.6302 -9.2809,-23.8648 18.5616,-1.2349 9.5047,-15.4681 14.1422,-15.4681 4.6375,0 5.7453,9.3718 11.9325,15.4681 z"
- style="font-size:12px;fill:url(#linearGradient758);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path909"
- d="m 407.6077,558.7106 c 0,8.3583 -4.7639,20.9549 -10.6405,20.9549 -5.8765,0 -9.5765,-0.3729 -9.5765,-8.7312 0,-8.3583 -0.5562,-13.3878 5.3203,-13.3878 5.8766,0 13.3006,-4.8658 14.8967,1.1641 z"
- style="font-size:12px;fill:url(#radialGradient713);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g><path
- transform="matrix(0.528691,0.0426828,-0.143181,0.403416,335.222,445.2067)"
- sodipodi:nodetypes="ccccccc"
- id="path853"
- d="m 230.9704,435.9243 c -4.6075,16.1567 18.7059,38.1846 -0.4607,32.7187 -19.1666,-5.4659 -30.1038,-20.5459 -25.4963,-36.7026 8.6398,0.1058 10.9475,-0.0693 16.8865,1.1368 -6.5929,-5.7167 -8.1833,-6.7366 -13.3909,-10.758 1.9454,-8.3168 29.1026,-14.9176 38.6859,-12.1847 19.1665,5.4658 -11.617,9.6333 -16.2245,25.7898 z"
- style="font-size:12px;fill:url(#linearGradient1226);fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/pepinux_Pez_dorado.svg b/src/activities/reversecount/resource/pepinux_Pez_dorado.svg
deleted file mode 100644
index 55ecab5c0..000000000
--- a/src/activities/reversecount/resource/pepinux_Pez_dorado.svg
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg3142"
- viewBox="0 0 360.37512 211.33553"
- version="1.0"
- inkscape:version="0.91 r13725"
- width="100%"
- height="100%"
- sodipodi:docname="pepinux_Pez_dorado.svg">
- <sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1242"
- inkscape:window-height="679"
- id="namedview52"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:zoom="1.0569688"
- inkscape:cx="15.159825"
- inkscape:cy="99.694661"
- inkscape:window-x="0"
- inkscape:window-y="0"
- inkscape:window-maximized="0"
- inkscape:current-layer="g3720" />
- <defs
- id="defs3144">
- <linearGradient
- id="linearGradient3984">
- <stop
- id="stop3986"
- stop-color="#fff"
- offset="0" />
- <stop
- id="stop3988"
- stop-color="#fff"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3917">
- <stop
- id="stop3919"
- stop-color="#ffc900"
- offset="0" />
- <stop
- id="stop3921"
- stop-color="#ff0"
- offset="1" />
- </linearGradient>
- <linearGradient
- id="linearGradient3970">
- <stop
- id="stop3972"
- stop-color="#ff7300"
- offset="0" />
- <stop
- id="stop4021"
- stop-color="#ffdb00"
- offset=".64833" />
- <stop
- id="stop3974"
- stop-color="#ff6582"
- offset="1" />
- </linearGradient>
- <radialGradient
- id="radialGradient3939"
- xlink:href="#linearGradient3970"
- gradientUnits="userSpaceOnUse"
- cy="123.31"
- cx="290.79001"
- gradientTransform="matrix(0.54185,-0.013525,0.0087772,0.35165,-138.2,75.9)"
- r="35.443001" />
- <radialGradient
- id="radialGradient3941"
- xlink:href="#linearGradient3917"
- gradientUnits="userSpaceOnUse"
- cy="159.97"
- cx="357.42999"
- gradientTransform="matrix(0.52302,-0.17452,0.07329,0.21965,-160.75,151.56)"
- r="15.965" />
- <linearGradient
- id="linearGradient3943"
- x1="420.07001"
- xlink:href="#linearGradient3917"
- gradientUnits="userSpaceOnUse"
- y1="155.83"
- gradientTransform="matrix(0.26858,0,0,0.26858,-57.852,81.118)"
- x2="391.63"
- y2="174.42999" />
- <linearGradient
- id="linearGradient3945"
- x1="387.25"
- xlink:href="#linearGradient3917"
- gradientUnits="userSpaceOnUse"
- y1="98.948997"
- gradientTransform="matrix(0.26858,0,0,0.26858,-57.705,82.242)"
- x2="374.12"
- y2="68.865997" />
- <linearGradient
- id="linearGradient3947"
- x1="336.92001"
- xlink:href="#linearGradient3970"
- gradientUnits="userSpaceOnUse"
- y1="78.875"
- gradientTransform="matrix(0.42536,0,0,0.22889,-96.309,92.036)"
- x2="339.85001"
- y2="140.14" />
- <linearGradient
- id="linearGradient3949"
- x1="400.92999"
- xlink:href="#linearGradient3984"
- gradientUnits="userSpaceOnUse"
- y1="81.444"
- gradientTransform="matrix(0.28889,0,0,0.30378,-65.593,77.981)"
- x2="400.92999"
- y2="128.09" />
- <linearGradient
- id="linearGradient3951"
- x1="340.10999"
- xlink:href="#linearGradient3984"
- gradientUnits="userSpaceOnUse"
- y1="193.28999"
- gradientTransform="matrix(0.14592,0,0,0.11771,12.444,103.56)"
- x2="340.10999"
- y2="81.848" />
- <linearGradient
- id="linearGradient3953"
- x1="324.07999"
- gradientUnits="userSpaceOnUse"
- y1="64.653"
- gradientTransform="matrix(0.26858,0,0,0.26858,-56.254,82.436)"
- x2="311.47"
- y2="111.72">
- <stop
- id="stop4034"
- stop-color="#fff"
- offset="0" />
- <stop
- id="stop4036"
- stop-color="#fff"
- stop-opacity="0"
- offset="1" />
- </linearGradient>
- </defs>
- <g
- id="layer1"
- transform="translate(-24.691429,-102.95913)">
- <g
- id="g3720"
- transform="matrix(-5.9727,0,0,5.9727,1747.7,-1561.1)">
- <g
- id="g3744"
- transform="matrix(1.1556,0,0,1.1556,207.76,163.57)">
- <path
- id="path3746"
- d="m 22.633,104.12 c -1.168,0 -2.224,0.18 -3.164,0.51 5.048,1.1 8.453,5.74 11.415,9.4 0,4.72 -6.469,7.89 -12.808,7.89 -0.147,0 -0.292,-0.01 -0.437,-0.01 1.579,0.84 3.557,1.31 5.876,1.31 6.325,0 12.783,-3.45 12.783,-8.6 -3.379,-4.56 -7.339,-10.5 -13.665,-10.5 z"
- inkscape:connector-curvature="0"
- style="fill:url(#radialGradient3939)" />
- <path
- id="path3748"
- d="m 39.202,119.69 c 0.176,0 0.147,1.77 0.147,2.35 0,0.86 -0.844,1.38 -1.322,1.62 -0.623,0.31 -0.861,0.4 -1.175,1.02 -0.102,0.21 2.171,0.05 2.35,0 0.943,-0.23 1.885,-0.36 2.792,-0.58 0.76,-0.19 1.423,-0.84 2.203,-1.03 0.572,-0.14 0.912,-0.8 1.175,-1.32 0.426,-0.85 -1.868,-0.36 -2.791,-0.59 -0.196,-0.05 -0.391,-0.1 -0.587,-0.15 -0.699,-0.17 -1.384,-1.01 -2.057,-1.17 -0.242,-0.06 -0.49,-0.1 -0.735,-0.15 z"
- inkscape:connector-curvature="0"
- style="fill:url(#radialGradient3941);fill-rule:evenodd" />
- <path
- id="path3750"
- d="m 56.882,121.5 c -1.068,-0.26 -0.985,2.02 -1.763,2.79 -0.569,0.57 -0.873,1.32 -1.469,1.91 -1.407,2.98 -7.265,3.55 -10.578,3.97 0.776,-0.91 2.163,-0.81 3.232,-1.03 1.669,-0.57 3.407,-1.26 4.701,-2.5 0.937,-0.93 -0.734,-0.4 -1.175,-0.29 -0.531,0.13 -1.085,0.43 -1.616,0.29 -0.157,-0.03 1.604,-1.11 2.644,-2.49 0.392,-0.53 -1.325,0.73 -1.909,0.44 -0.657,-0.33 0.993,-1.11 1.322,-1.77 0.379,-0.75 0.654,-0.58 1.763,-0.58 h 2.203 c 1.14,0 1.693,-0.26 2.645,-0.74 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3943);fill-rule:evenodd" />
- <path
- id="path3752"
- d="m 58.938,107.06 c -0.346,-0.68 -1.242,-1.45 -2.056,-2.06 -1.138,-0.85 -2.115,-1.66 -3.232,-2.5 -1.753,-1.93 0.102,0.42 0.587,1.76 0.072,0.44 -1.544,-1.25 -2.056,-1.76 -1.331,-1.06 -2.248,-1.69 -3.967,-2.937 -0.84,-0.168 0.939,1.437 1.322,2.207 0.375,0.75 0.588,1.08 0.588,1.76 0,0.9 -1.249,-1.36 -2.057,-1.76 -0.714,-0.36 -1.175,-1.4 -1.175,-0.15 0,1.96 -0.101,1.44 -1.763,1.03 -1.123,-0.28 -2.37,-0.38 -0.734,0.44 0.136,0.07 -1.959,0.15 -2.498,0.15 -0.018,0 -0.981,0.58 -1.469,0.58 -0.628,0 -0.564,0.74 -1.91,0.74 -0.945,0 -0.296,0.88 -1.616,0.88 -1.104,0 -1.028,0.44 -1.762,1.17 -0.959,0.96 -1.277,0.63 -0.588,2.36 0.349,0.87 0.294,1.64 0.294,2.64 0,1.54 -0.743,1.14 0.881,0.73 0.903,-0.22 1.847,-1.25 2.351,-1.76 0.59,-0.59 1.069,-1.21 1.616,-1.76 0.706,-0.71 2.121,-0.62 2.938,-1.03 0.958,-0.48 2.632,-0.03 3.672,-0.29 1.296,-0.33 2.773,-0.15 4.114,-0.15 h 7.051 c 0.635,0 0.8,-0.03 1.469,-0.29 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3945);fill-rule:evenodd" />
- <path
- id="path3754"
- d="m 34.779,112.48 c 1.923,-3.59 8.506,-6.48 16.3,-6.94 9.25,-0.55 15.301,4.55 18.092,8.55 0.094,0.14 -3.323,2.05 -3.237,2.18 0.094,0.15 3.69,-1.49 3.775,-1.35 -1.028,4.67 -9.319,7.9 -18.63,7.9 -7.012,0 -13.028,-2.08 -15.572,-5.04"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3947);stroke:#ffa500;stroke-width:0.28549999;stroke-linecap:round" />
- <path
- id="path3756"
- transform="matrix(-0.29561,0,0,0.3534,173.86,43.477)"
- d="m 378.64,198.63 a 6.77,3.6751686 0 1 1 -13.54,0 6.77,3.6751686 0 1 1 13.54,0 z"
- inkscape:connector-curvature="0" />
- <path
- id="path3758"
- d="m 52.104,106.07 c -0.294,0.01 -0.59,0.02 -0.89,0.03 -9.017,0.48 -16.367,3.91 -16.367,7.79 0,0.71 0.253,1.39 0.705,2.03 3.444,-1.44 9.605,-2.4 16.627,-2.4 6.785,0 12.763,0.9 16.266,2.26 0.411,-0.52 0.706,-1.06 0.848,-1.63 -2.347,-3.4 -8.102,-8.24 -17.189,-8.08 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3949)" />
- <path
- id="path3760"
- d="m 378.64,198.63 a 6.77,3.6751686 0 1 1 -13.54,0 6.77,3.6751686 0 1 1 13.54,0 z"
- transform="matrix(-0.18919,0,0,0.22618,134.39,68.774)"
- inkscape:connector-curvature="0"
- style="stroke:#fff786;stroke-width:1.77170002;stroke-linecap:round" />
- <path
- id="path3762"
- d="m 69.398,115.33 c -0.353,2.4 -3.198,4.06 -6.392,4.06 -3.194,0 -5.786,-1.89 -5.786,-4.21 0,-2.33 2.598,-4.39 5.786,-4.67 3.396,-0.31 5.535,2.72 6.392,4.82 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3951)" />
- <path
- id="path3764"
- d="m 22.633,104.31 c -1.168,0 -2.224,0.18 -3.164,0.51 2.42,0.53 4.456,1.88 6.253,3.53 4.876,0.89 8.519,4.4 8.519,8.6 0,1.15 -0.277,2.23 -0.772,3.24 1.732,-1.42 2.829,-3.25 2.829,-5.37 -3.379,-4.57 -7.339,-10.51 -13.665,-10.51 z"
- inkscape:connector-curvature="0"
- style="fill:url(#linearGradient3953)" />
- </g>
- </g>
- </g>
- <metadata
- id="metadata50">
- <rdf:RDF>
- <cc:Work>
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <cc:license
- rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
- <dc:publisher>
- <cc:Agent
- rdf:about="http://openclipart.org/">
- <dc:title>Openclipart</dc:title>
- </cc:Agent>
- </dc:publisher>
- <dc:title>Pez dorado (gold fish)</dc:title>
- <dc:date>2007-11-18T19:12:47</dc:date>
- <dc:description>Pez dorado al estilo web 2.0. Gold fish with web 2.0 style.
-\nEncuentra mis videotutoriales en: http://www.depinux.blogspot.com</dc:description>
- <dc:source>http://openclipart.org/detail/10779/pez-dorado-(gold-fish)-by-pepinux-10779</dc:source>
- <dc:creator>
- <cc:Agent>
- <dc:title>pepinux</dc:title>
- </cc:Agent>
- </dc:creator>
- <dc:subject>
- <rdf:Bag>
- <rdf:li>animal</rdf:li>
- <rdf:li>clip art</rdf:li>
- <rdf:li>clipart</rdf:li>
- <rdf:li>fish</rdf:li>
- <rdf:li>goldfish</rdf:li>
- <rdf:li>image</rdf:li>
- <rdf:li>media</rdf:li>
- <rdf:li>nature</rdf:li>
- <rdf:li>png</rdf:li>
- <rdf:li>public domain</rdf:li>
- <rdf:li>svg</rdf:li>
- </rdf:Bag>
- </dc:subject>
- </cc:Work>
- <cc:License
- rdf:about="http://creativecommons.org/licenses/publicdomain/">
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Reproduction" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#Distribution" />
- <cc:permits
- rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
- </cc:License>
- </rdf:RDF>
- </metadata>
-</svg>
diff --git a/src/activities/reversecount/resource/phoque.svg b/src/activities/reversecount/resource/phoque.svg
deleted file mode 100644
index 970f91558..000000000
--- a/src/activities/reversecount/resource/phoque.svg
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg1276"
- sodipodi:version="0.32"
- width="296.63766"
- height="204.41705"
- xml:space="preserve"
- sodipodi:docname="phoque.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true"
- version="1.0"><metadata
- id="metadata65"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs1278"><linearGradient
- id="linearGradient1418"><stop
- style="stop-color:#00b7c5;stop-opacity:0.2471;"
- offset="0"
- id="stop1419" /><stop
- style="stop-color:#00a2af;stop-opacity:0.7725;"
- offset="1"
- id="stop1420" /></linearGradient><linearGradient
- id="linearGradient1340"><stop
- style="stop-color:#7a6f6a;stop-opacity:1;"
- offset="0"
- id="stop1341" /><stop
- style="stop-color:#d5d7d7;stop-opacity:1;"
- offset="1"
- id="stop1342" /></linearGradient><linearGradient
- id="linearGradient1310"><stop
- style="stop-color:#917d6a;stop-opacity:1;"
- offset="0"
- id="stop1311" /><stop
- style="stop-color:#d5d7d7;stop-opacity:1;"
- offset="1"
- id="stop1312" /></linearGradient><linearGradient
- id="linearGradient1294"><stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop1295" /><stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop1296" /></linearGradient><linearGradient
- id="linearGradient1290"><stop
- style="stop-color:#000;stop-opacity:1;"
- offset="0"
- id="stop1291" /><stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop1292" /></linearGradient><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2239"
- x1="334.89563"
- y1="721.4386"
- x2="661.99615"
- y2="316.82236"
- gradientTransform="scale(0.9502481,1.0523568)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2241"
- x1="192.94312"
- y1="595.07263"
- x2="71.29454"
- y2="609.94623"
- gradientTransform="scale(0.9545859,1.0475747)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2243"
- x1="160.89667"
- y1="859.55096"
- x2="463.50537"
- y2="398.85052"
- gradientTransform="scale(1.1307192,0.8843929)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2245"
- x1="237.51802"
- y1="874.25836"
- x2="381.78644"
- y2="674.45703"
- gradientTransform="scale(1.3205365,0.757268)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2247"
- x1="657.44122"
- y1="384.42941"
- x2="762.86127"
- y2="373.1348"
- gradientTransform="scale(0.6778659,1.475218)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2249"
- x1="895.75824"
- y1="304.38452"
- x2="716.55084"
- y2="326.83191"
- gradientTransform="scale(0.5528039,1.8089599)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2251"
- x1="781.24292"
- y1="280.20306"
- x2="804.02814"
- y2="249.91071"
- gradientTransform="scale(0.5334034,1.8747537)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1310"
- id="linearGradient2253"
- x1="581.19305"
- y1="380.67068"
- x2="799.9375"
- y2="330.11044"
- gradientTransform="scale(0.6483586,1.5423564)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1418"
- id="linearGradient2255"
- x1="193.25394"
- y1="815.20807"
- x2="187.19662"
- y2="981.36877"
- gradientTransform="scale(1.3912636,0.718771)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1294"
- id="radialGradient2257"
- gradientTransform="scale(1.025977,0.9746807)"
- cx="259.90839"
- cy="535.50891"
- fx="259.90839"
- fy="535.50891"
- r="3.8703589"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1294"
- id="radialGradient2259"
- gradientTransform="scale(1.025977,0.9746807)"
- cx="259.90839"
- cy="535.50891"
- fx="259.90839"
- fy="535.50891"
- r="3.8703589"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1340"
- id="radialGradient2261"
- cx="180.98524"
- cy="702.36951"
- fx="180.98524"
- fy="702.36951"
- r="136.41203"
- gradientTransform="scale(1.3140588,0.7610009)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1290"
- id="radialGradient2263"
- cx="212.87097"
- cy="583.24658"
- fx="212.87097"
- fy="583.24658"
- r="47.984882"
- gradientTransform="scale(1.0889238,0.9183379)"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- inkscape:zoom="0.31834771"
- inkscape:cx="198.26506"
- inkscape:cy="364.13689"
- inkscape:window-width="822"
- inkscape:window-height="592"
- inkscape:window-x="3"
- inkscape:window-y="25"
- inkscape:current-layer="g2210"
- showgrid="false"
- borderlayer="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-maximized="0" /><g
- id="g2210"
- transform="matrix(0.8,0,0,0.8,-116.55144,-421.83386)"><g
- id="g1878"><g
- id="g1869"><path
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.14103,107.3824)"
- sodipodi:nodetypes="ccssssssc"
- id="path1283"
- d="m 310.0553,561.5891 c 1.6704,11.1976 30.4243,11.5831 60.523,41.6506 5.0639,2.7875 29.7455,3.6197 33.4047,3.9032 8.8859,0.9836 25.2908,3.4537 29.8201,3.8129 1.9484,0.007 19.354,6.7553 18.2047,11.2803 -12.5839,48.7088 -181.2351,263.027 -254.6336,53.2987 -7.8721,-22.3142 -2.9342,-77.1379 -1.3011,-90.9131 3.0916,-26.0786 -15.9901,-96.5985 42.5219,-104.5329 59.7887,-8.1902 66.7357,34.7345 71.4603,81.5003 z"
- style="font-size:12px;fill:url(#linearGradient2239);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.14103,107.3824)"
- sodipodi:nodetypes="ccccs"
- id="path1304"
- d="m 194.1216,644.4517 c -0.0508,2.759 -0.2386,-26.3982 -7.87,-26.3982 -59.3652,33.4084 -69.2142,85.5303 -84.0405,42.0889 18.3746,-51.8593 62.1584,-97.66 95.6321,-86.8022 -3.7822,28.7431 -4.1124,60.2588 -3.7216,71.1115 z"
- style="font-size:12px;fill:url(#linearGradient2241);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.14103,107.3824)"
- sodipodi:nodetypes="cscsss"
- id="path1325"
- d="m 319.05,680.2763 c 33.291,71.9369 100.3932,-57.2053 96.1656,-7.8511 -0.1515,11.5201 -69.5619,90.9544 -127.9036,91.7896 -41.5145,0 -80.18,-46.1318 -90.2025,-94.7962 -9.0279,-47.8197 18.3994,-78.9643 41.7604,-77.2569 33.7767,2.4687 75.0515,77.0323 80.1801,88.1146 z"
- style="font-size:12px;fill:url(#linearGradient2243);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.14103,107.3824)"
- sodipodi:nodetypes="cccsscs"
- id="path1306"
- d="m 486.9268,683.6175 c -10.4786,32.9159 -19.0492,-9.6049 -77.4002,-9.6049 -29.1755,0 -39.0113,-15.2544 -60.7589,-19.8982 -6.6897,-1.1718 -17.5199,-4.8998 -29.718,-13.9277 -4.7019,-3.6569 -9.3479,-16.2674 -13.1721,-27.0113 -13.3976,-38.2303 12.1665,-18.5373 19.209,-17.2845 58.9418,2.9528 172.2419,55.052 161.8402,87.7266 z"
- style="font-size:12px;fill:url(#linearGradient2245);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.93214,110.3417)"
- sodipodi:nodetypes="cscssccs"
- id="path1331"
- d="m 451.0132,510.7288 c 3.3381,-0.3805 18.4285,-14.0807 23.0251,-13.7531 26.6551,2.7355 -12.5023,112.7929 -28.4497,131.5851 3.325,-19.6367 0.3034,-16.1934 -21.6235,-17.7081 -12.0764,-0.8456 32.1211,3.5659 11.2246,-21.8819 -8.7213,-10.7732 -9.2328,-31.8272 -9.2328,-49.0097 0,-15.1551 6.1072,-45.5188 12.1105,-44.6837 3.4978,0 7.0939,16.1183 12.9458,15.4514 z"
- style="font-size:12px;fill:url(#linearGradient2247);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.93214,110.3417)"
- sodipodi:nodetypes="ccsccc"
- id="path1319"
- d="m 479.7797,499.5773 c 9.4493,18.9179 10.0101,89.2705 -12.8914,91.6328 -8.3502,14.7647 -21.9863,44.7703 -21.7017,41.414 0.8514,-15.2666 7.5278,-30.0355 6.9372,-57.655 -5.9058,-20.099 -4.6947,-47.0439 4.0326,-41.138 21.7203,24.8045 30.7103,-13.0121 23.6233,-34.2538 z"
- style="font-size:12px;fill:url(#linearGradient2249);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.939226,-0.12497,0.108555,0.958957,-9.120029,104.0455)"
- id="path1322"
- d="m 427.2861,544.6091 c 0,19.4886 -4.495,35.2873 -10.0399,35.2873 -5.5448,0 -10.0399,-15.7987 -10.0399,-35.2873 0,-19.4886 4.4951,-35.2872 10.0399,-35.2872 5.5449,0 10.0399,15.7986 10.0399,35.2872 z"
- style="font-size:12px;fill:url(#linearGradient2251);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.939226,-0.12497,0.108555,0.958957,-9.120029,104.0455)"
- sodipodi:nodetypes="csccsscc"
- id="path1308"
- d="m 444.0056,506.653 c 4.6182,13.4157 -1.0132,31.1231 -7.5545,49.1442 -10.0373,26.8392 2.7338,42.6872 -6.113,58.3094 -6.4809,2.8653 -15.3622,-1.3051 -24.5764,-5.363 8.2871,-2.0618 13.7052,-8.9689 13.2968,-13.2827 -0.8306,-9.2773 -3.2032,-13.6228 -13.0141,-29.4081 -3.2035,-5.3143 -13.6785,-33.8055 4.4743,-45.9988 7.7079,13.5862 18.7203,5.3927 33.4869,-13.401 z"
- style="font-size:12px;fill:url(#linearGradient2253);fill-opacity:1;fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g><g
- style="font-size:12px"
- id="g1794"><path
- transform="matrix(0.825265,0,0,0.894718,121.9546,100.351)"
- sodipodi:nodetypes="ccccccccccccsscssccccscccsc"
- id="path1416"
- d="m 382.109,599.6777 c 1.2528,0.2056 25.5754,-7.6988 6.811,-31.4324 2.8468,3.4108 19.1919,14.274 22.5517,7.0175 3.483,12.1093 2.9433,22.1064 0.1127,26.9106 l 2.3113,0.7001 c 7.38,-3.5833 6.9033,-10.3054 -0.4922,-19.1302 -0.8861,-4.4183 -3.5785,-14.9937 -3.7435,-18.5596 11.1554,-2.4742 16.1931,0.6243 18.8198,0.9999 0.4858,1.7042 0.9611,8.3357 1.3283,10.6804 10.4791,1.2935 26.5255,-4.0011 28.4518,-8.3591 -1.6388,7.0298 -7.0094,15.6844 -13.2391,16.0379 -5.8747,12.3171 -18.5717,39.4883 -19.7757,42.239 11.5621,6.9142 43.4833,25.9891 42.4841,41.8339 0.1466,4.2974 -3.1107,17.3771 -9.2699,17.4051 -6.5588,0.2521 -28.8533,-18.8998 -56.0963,-19.3174 -58.4181,81.8507 -112.0877,99.5105 -142.4815,95.5498 -41.5454,-5.3867 -72.0581,-51.649 -84.6261,-94.5483 -4.1559,-14.1167 -1.8448,-45.0245 -9.4352,-49.1692 -2.3713,-0.8137 -70.27207,96.2676 -81.99606,48.1471 -4.04743,-15.2515 27.24246,-64.2502 41.57956,-77.9856 15.9563,5.481 26.3889,2.9019 47.188,1.4899 -4.3733,21.1919 8.2253,20.8971 42.606,19.5952 33.1386,-0.4196 50.446,-3.4228 65.4332,-10.9397 24.953,3.2445 23.1072,0.9151 16.1558,-9.523 13.234,-0.7253 23.5724,-12.1842 14.3967,-17.0896 14.0922,6.9893 21.2066,10.4936 35.664,22.8392 5.8728,5.0455 24.4038,3.9887 35.2616,4.6085 z"
- style="font-size:12px;fill:url(#linearGradient2255);fill-opacity:0.44750001;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.825265,0,0,0.894718,121.9546,100.351)"
- sodipodi:nodetypes="ccccccccccc"
- id="path1620"
- d="m 170.4843,543.9086 c -36.4687,0.5835 -78.82697,10.3595 -83.04708,41.4931 -4.22006,31.1335 55.09968,60.9772 132.49428,66.6577 77.3946,5.6805 143.5564,-14.9532 147.7766,-46.0869 4.2201,-31.1334 -28.898,-51.9903 -82.9068,-58.9237 l 0.278,4.3531 c 53.5473,7.6543 76.9899,27.8661 71.5835,54.3919 -5.4064,26.5258 -66.7395,42.8399 -136.991,36.4383 -70.2516,-6.4014 -122.81889,-33.0944 -117.4124,-59.6203 5.4063,-26.5257 43.3532,-34.4877 68.9206,-35.1854 l -0.6957,-3.5178 z"
- style="font-size:12px;fill:#a1eaf0;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.825265,0,0,0.894718,121.9546,100.351)"
- sodipodi:nodetypes="ccccccccccc"
- id="path1621"
- d="m 168.8991,533.6832 c -63.6575,2.6412 -134.12531,18.9792 -139.85147,65.368 -5.72609,46.3887 74.76337,90.8555 179.77817,99.3194 105.0149,8.4639 194.7882,-22.2801 200.5144,-68.6691 5.7261,-46.3885 -52.7945,-85.1428 -126.0776,-95.4735 l 0.3772,3.5332 c 72.6569,11.4048 126.3174,50.9696 118.9815,90.4929 -7.3358,39.5232 -104.7312,69.1464 -200.0538,59.6081 -95.3226,-9.538 -173.73689,-51.6728 -166.40095,-91.1961 6.74508,-47.2008 80.08605,-57.8829 133.08595,-58.9226 l -0.3534,-4.0603 z"
- style="font-size:12px;fill:#a1eaf0;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- transform="matrix(0.825265,0,0,0.894718,121.9546,100.351)"
- sodipodi:nodetypes="cscsccscscc"
- id="path1622"
- d="m 380.9812,557.4263 c -4.0277,6.2536 0.0138,13.4361 0.7745,14.5058 8.4756,12.221 20.6204,19.4508 38.2687,19.9178 30.2464,1.9287 55.3431,-5.2557 57.7523,-15.6478 2.2182,-9.5684 -8.7408,-15.9417 -17.3612,-17.2876 l -0.2565,1.6869 c 8.0162,0.9135 17.1857,6.2384 15.0728,15.2447 -2.1128,9.0063 -27.8541,14.8407 -55.3088,12.6672 -18.3259,-1.1294 -28.2211,-8.8751 -35.296,-18.1549 -1.7957,-2.5947 -5.3322,-7.5334 -3.374,-11.7376 l -0.2718,-1.1945 z"
- style="font-size:12px;fill:#a1eaf0;fill-rule:evenodd"
- inkscape:connector-curvature="0" /></g><g
- style="font-size:12px"
- transform="matrix(0.824696,-0.03321299,0.03063481,0.894102,85.14103,107.3824)"
- id="g1374"><g
- style="font-size:12px"
- id="g1297"><path
- sodipodi:ry="9.8137207"
- sodipodi:rx="8.2476807"
- sodipodi:cy="515.94958"
- sodipodi:cx="270.08551"
- d="m 278.33319,515.94958 a 8.2476807,9.8137207 0 0 1 -8.24768,9.81373 8.2476807,9.8137207 0 0 1 -8.24768,-9.81373 8.2476807,9.8137207 0 0 1 8.24768,-9.81372 8.2476807,9.8137207 0 0 1 8.24768,9.81372 z"
- id="path1288"
- style="fill:#f1f1f1;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="matrix(1.133334,0,0,1.157896,-35.99757,-83.01585)"
- sodipodi:ry="5.9508667"
- sodipodi:rx="6.2640533"
- sodipodi:cy="519.81244"
- sodipodi:cx="269.98114"
- d="m 276.24519,519.81244 a 6.2640533,5.9508667 0 0 1 -6.26405,5.95087 6.2640533,5.9508667 0 0 1 -6.26405,-5.95087 6.2640533,5.9508667 0 0 1 6.26405,-5.95087 6.2640533,5.9508667 0 0 1 6.26405,5.95087 z"
- id="path1289"
- style="fill:url(#radialGradient2257);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /></g><g
- style="font-size:12px"
- transform="matrix(0.987925,0.154935,-0.154935,0.987925,29.32935,-43.96762)"
- id="g1300"><path
- sodipodi:ry="9.8137207"
- sodipodi:rx="8.2476807"
- sodipodi:cy="515.94958"
- sodipodi:cx="270.08551"
- d="m 278.33319,515.94958 a 8.2476807,9.8137207 0 0 1 -8.24768,9.81373 8.2476807,9.8137207 0 0 1 -8.24768,-9.81373 8.2476807,9.8137207 0 0 1 8.24768,-9.81372 8.2476807,9.8137207 0 0 1 8.24768,9.81372 z"
- id="path1301"
- style="fill:#f1f1f1;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /><path
- transform="matrix(1.133334,0,0,1.157896,-35.99757,-83.01585)"
- sodipodi:ry="5.9508667"
- sodipodi:rx="6.2640533"
- sodipodi:cy="519.81244"
- sodipodi:cx="269.98114"
- d="m 276.24519,519.81244 a 6.2640533,5.9508667 0 0 1 -6.26405,5.95087 6.2640533,5.9508667 0 0 1 -6.26405,-5.95087 6.2640533,5.9508667 0 0 1 6.26405,-5.95087 6.2640533,5.9508667 0 0 1 6.26405,5.95087 z"
- id="path1302"
- style="fill:url(#radialGradient2259);fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:type="arc" /></g><path
- sodipodi:nodetypes="ccccc"
- id="path1287"
- d="m 278.3332,541.2147 c 0,7.9569 -32.5433,31.3203 -47.1893,0.6264 -7.7555,19.0009 -33.8259,7.3305 -33.8259,-0.6264 0,-7.957 16.0479,-30.9028 38.4196,-30.9028 22.3717,0 42.5956,22.9458 42.5956,30.9028 z"
- style="font-size:12px;fill:url(#radialGradient2261);fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- sodipodi:nodetypes="ccccc"
- id="path1285"
- d="m 247.4536,523.7918 c 0,8.8066 -4.4951,-12.742 -15.6862,16.7871 -7.9936,-36.0317 -14.4334,-9.1617 -14.4334,-17.9683 0.2088,-2.5424 5.5033,-7.4329 16.1038,-7.4329 10.6005,0 13.807,6.9069 14.0158,8.6141 z"
- style="font-size:12px;fill:url(#radialGradient2263);fill-opacity:0.61879997;fill-rule:evenodd"
- inkscape:connector-curvature="0" /><path
- id="path1353"
- d="m 257.4994,546.2539 c 11.0636,11.3524 15.5241,18.3253 20.4429,33.2085 m -18.6208,-35.9045 c 14.298,6.8447 20.8881,11.8535 30.6342,24.1302 m -29.6666,-27.3495 c 15.6699,2.3946 23.4311,5.2722 36.3241,14.1871 m -36.8767,-18.3144 c 15.8498,-1.2942 24.6085,0.0411 38.1804,7.9357 m -38.8213,-11.9208 c 15.2192,-4.4815 25.3698,-4.1628 38.9357,2.1748"
- style="font-size:12px;fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:round"
- inkscape:connector-curvature="0" /><path
- id="path1354"
- d="m 210.5431,540.1986 c -11.0636,11.3524 -15.5241,18.3253 -20.4429,33.2085 m 18.6208,-35.9045 c -14.298,6.8447 -20.8881,11.8535 -30.6342,24.1302 m 29.6666,-27.3495 c -15.6699,2.3946 -23.4311,5.2722 -36.3241,14.1871 M 208.306,530.156 c -15.8498,-1.2942 -24.6085,0.0411 -38.1804,7.9357 m 38.8213,-11.9208 c -15.2192,-4.4815 -25.3698,-4.1628 -38.9357,2.1748"
- style="font-size:12px;fill:none;stroke:#000000;stroke-width:1.25;stroke-linecap:round;stroke-dasharray:none"
- inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/resource/tux_top_south.svg b/src/activities/reversecount/resource/tux_top_south.svg
deleted file mode 100644
index da60e22f2..000000000
--- a/src/activities/reversecount/resource/tux_top_south.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg641"
- sodipodi:version="0.32"
- width="370.27991"
- height="274.00449"
- xml:space="preserve"
- sodipodi:docname="tux_top_south.svg"
- inkscape:version="0.91 r13725"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0"><metadata
- id="metadata30"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs643"><linearGradient
- id="linearGradient679"><stop
- style="stop-color:#ff8d00;stop-opacity:1;"
- offset="0"
- id="stop680" /><stop
- style="stop-color:#ffca00;stop-opacity:1;"
- offset="1"
- id="stop681" /></linearGradient><linearGradient
- id="linearGradient653"><stop
- style="stop-color:#000;stop-opacity:1;"
- offset="0"
- id="stop654" /><stop
- style="stop-color:#fff;stop-opacity:1;"
- offset="1"
- id="stop655" /></linearGradient><radialGradient
- xlink:href="#linearGradient653"
- id="radialGradient656"
- cx="358.1265"
- cy="445.37637"
- r="199.78981"
- fx="358.1265"
- fy="445.37637"
- gradientTransform="scale(1.0389249,0.9625335)"
- gradientUnits="userSpaceOnUse" /><radialGradient
- xlink:href="#linearGradient653"
- id="radialGradient657"
- cx="354.94388"
- cy="423.69528"
- r="440.81244"
- fx="354.94388"
- fy="423.69528"
- gradientTransform="matrix(0.9847605,0,0,1.0154754,-168.64595,-256.1048)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient653"
- id="linearGradient658"
- x1="298.20947"
- y1="466.4436"
- x2="72.434669"
- y2="323.85239"
- gradientTransform="matrix(0.9865045,0,0,1.0136802,-168.64595,-256.1048)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient653"
- id="linearGradient659"
- x1="406.58887"
- y1="478.55396"
- x2="657.74811"
- y2="350.79272"
- gradientTransform="matrix(1.0006179,0,0,0.9993824,-168.64595,-256.1048)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient679"
- id="linearGradient678"
- x1="248.15001"
- y1="429.63071"
- x2="313.13589"
- y2="480.32437"
- gradientTransform="matrix(0.9285675,0,0,1.0769276,-168.64595,-256.1048)"
- gradientUnits="userSpaceOnUse" /><linearGradient
- xlink:href="#linearGradient679"
- id="linearGradient682"
- x1="458.00345"
- y1="433.34595"
- x2="530.74615"
- y2="461.67737"
- gradientTransform="matrix(0.914169,0,0,1.0938897,-168.64595,-256.1048)"
- gradientUnits="userSpaceOnUse" /></defs><sodipodi:namedview
- id="base"
- width="300px"
- height="300px"
- inkscape:zoom="0.38674898"
- inkscape:cx="372.04724"
- inkscape:cy="526.18109"
- inkscape:window-width="910"
- inkscape:window-height="627"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:current-layer="svg641" /><path
- style="font-size:12px;fill:url(#linearGradient682);fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 237.75125,227.0673 C 239.29095,239.7237 225.26135,265.8724 243.17055,273.7874 C 245.95235,275.2177 251.16585,269.1428 254.12645,268.309 C 261.13215,266.3512 276.10555,270.2386 279.33585,269.6361 C 282.41475,268.959 290.03045,260.881 296.59765,259.3195 C 303.17435,257.9728 307.77935,260.5416 309.91645,258.2455 C 321.47465,242.6076 295.97895,226.933 290.95145,214.9361 C 280.78685,191.3069 274.51925,175.4685 251.63755,180.5007 C 228.75585,185.5328 235.12315,201.3666 237.75125,227.0673 z "
- id="path670"
- sodipodi:nodetypes="ccscscscs" /><path
- style="font-size:12px;fill:url(#linearGradient678);fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 132.76085,224.5617 C 131.17215,237.2181 145.64725,263.3668 127.16945,271.2818 C 124.29935,272.7121 118.92035,266.6372 115.86565,265.8034 C 108.63755,263.8456 93.188853,267.733 89.855953,267.1305 C 86.679253,266.4534 78.821853,258.3754 72.046153,256.8139 C 65.260653,255.4672 60.509453,258.036 58.304353,255.7399 C 46.379353,240.102 72.684453,224.4274 77.871653,212.4305 C 88.358853,188.8013 94.825451,172.9629 118.43365,177.9951 C 142.04175,183.0272 135.47225,198.861 132.76085,224.5617 z "
- id="path668"
- sodipodi:nodetypes="ccscscscs" /><path
- style="font-size:12px;fill:url(#radialGradient657);fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 298.11595,137.85 C 302.14965,190.7388 257.97155,242.2919 183.93115,242.2919 C 109.89085,242.2919 56.954153,185.8006 64.043253,134.5093 C 74.458553,56.6978 168.94895,25.0647 183.93115,-1.9095836e-14 C 200.09455,24.0204 294.94045,66.782 298.11595,137.85 z "
- id="path645"
- sodipodi:nodetypes="ccscs" /><path
- style="font-size:12px;fill:url(#linearGradient658);fill-rule:evenodd;stroke-width:1"
- d="M 88.605453,182.6698 C 54.929653,188.8979 3.0583537,237.1748 0.1525537,221.7906 C -2.7530463,206.4068 36.404153,137.2354 70.056953,130.8791 C 80.131653,139.6362 98.397651,180.8587 88.605453,182.6698 z "
- id="path648"
- sodipodi:nodetypes="cccs" /><path
- style="font-size:12px;fill:url(#linearGradient659);fill-rule:evenodd;stroke-width:1"
- d="M 279.09165,185.8185 C 312.90695,191.1522 367.50465,239.6844 370.15865,224.2548 C 372.81275,208.8256 331.36695,139.6791 297.61485,133.8733 C 284.52525,156.2339 271.30035,184.5896 279.09165,185.8185 z "
- id="path649"
- sodipodi:nodetypes="cccs" /><path
- style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 267.20345,202.7227 C 271.68815,210.4139 210.44175,247.0163 188.06555,236.3859 C 163.32685,247.0164 100.69745,214.9056 105.38405,206.2662 C 112.50915,193.1314 134.97895,192.6828 190.42785,192.6828 C 245.87665,192.6828 261.05765,192.1832 267.20345,202.7227 z "
- id="path652"
- sodipodi:nodetypes="ccscs" /><g
- id="g671"
- transform="translate(-169.82713,-254.24914)"><path
- sodipodi:type="arc"
- style="fill:url(#radialGradient656);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path650"
- d="m 452.38567,427.52661 a 80.319138,74.41333 0 0 1 -80.31914,74.41333 80.319138,74.41333 0 0 1 -80.31914,-74.41333 80.319138,74.41333 0 0 1 80.31914,-74.41333 80.319138,74.41333 0 0 1 80.31914,74.41333 z"
- sodipodi:cx="372.06653"
- sodipodi:cy="427.52661"
- sodipodi:rx="80.319138"
- sodipodi:ry="74.41333"
- transform="matrix(1.132352,0,0,1.174604,-68.14272,-108.9013)" /><path
- style="font-size:12px;fill:#ffaf00;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 398.0521,469.4579 C 398.0521,480.8739 374.4133,510.2081 354.3491,510.2081 C 336.6472,510.2081 310.646,482.0551 310.646,470.6391 C 310.646,459.2232 330.7414,475.9543 355.5303,475.9543 C 380.3191,475.9543 398.0521,458.042 398.0521,469.4579 z "
- id="path661"
- sodipodi:nodetypes="ccccc" /><path
- style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 350.2447,465.2768 C 348.9038,474.7918 343.2915,473.6254 337.9141,472.9001 C 330.4215,471.4719 323.078,469.0326 323.078,465.2768 C 323.078,454.8393 330.4122,443.4549 337.9141,443.4549 C 352.5153,444.29 352.1325,454.4265 350.2447,465.2768 z "
- id="path663"
- sodipodi:nodetypes="csccs" /><path
- style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1"
- d="M 356.904,466.1119 C 357.8686,475.6724 363.8572,474.4605 369.2346,473.7352 C 376.7272,472.307 384.0707,469.8677 384.0707,466.1119 C 384.0707,455.6744 376.7365,444.29 369.2346,444.29 C 354.6333,444.7075 355.4338,455.6791 356.904,466.1119 z "
- id="path664"
- sodipodi:nodetypes="csccs" /><path
- sodipodi:type="arc"
- style="fill:#141414;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path665"
- d="m 349.11731,467.92477 a 9.1872864,5.6376648 0 0 1 -9.18729,5.63767 9.1872864,5.6376648 0 0 1 -9.18728,-5.63767 9.1872864,5.6376648 0 0 1 9.18728,-5.63766 9.1872864,5.6376648 0 0 1 9.18729,5.63766 z"
- sodipodi:cx="339.93002"
- sodipodi:cy="467.92477"
- sodipodi:rx="9.1872864"
- sodipodi:ry="5.6376648" /><path
- sodipodi:type="arc"
- style="fill:#141415;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path666"
- d="m 349.11731,467.92477 a 9.1872864,5.6376648 0 0 1 -9.18729,5.63767 9.1872864,5.6376648 0 0 1 -9.18728,-5.63767 9.1872864,5.6376648 0 0 1 9.18728,-5.63766 9.1872864,5.6376648 0 0 1 9.18729,5.63766 z"
- sodipodi:cx="339.93002"
- sodipodi:cy="467.92477"
- sodipodi:rx="9.1872864"
- sodipodi:ry="5.6376648"
- transform="translate(27.14432,-3.051758e-5)" /></g></svg>
\ No newline at end of file
diff --git a/src/activities/reversecount/reversecount.js b/src/activities/reversecount/reversecount.js
index cfdc12bbb..c7e669e71 100644
--- a/src/activities/reversecount/reversecount.js
+++ b/src/activities/reversecount/reversecount.js
@@ -1,245 +1,229 @@
/* GCompris - reversecount.js
*
* Copyright (C) 2014 Emmanuel Charruau
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Emmanuel Charruau <echarruau@gmail.com> (Qt Quick port)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Major rework)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
.pragma library
.import QtQuick 2.6 as Quick
.import GCompris 1.0 as GCompris //for ApplicationInfo
var iceBlocksLayout = [[0, 0],[1, 0],[2, 0],[3, 0],[4, 0],
[4, 1],[4, 2],[4, 3],[4, 4],[3, 4],
[2, 4],[1, 4],[0, 4],[0, 3],[0, 2],
[0, 1]]
-var backgrounds = [
- "baleine.svg",
- "phoque.svg",
- "ourspolaire.svg",
- "morse.svg",
- "elephant_mer.svg",
- "epaulard.svg",
- "narval.svg"
- ]
-
var tuxIceBlockNumber = 0
var tuxIceBlockNumberGoal = 0
var tuxIsMoving = false;
var placeFishToReachBool = false
var level = null;
var fishes = [
"Benzfish.svg",
"blue-fish.svg",
"drunken_duck_cartoon_globefish_kugelfisch.svg",
"Fish02.svg",
"molumen_Codfish.svg",
"mystica_Aquarium_fish_-_Amphiprion_percula.svg",
"pepinux_Pez_dorado.svg",
"The_Whale-Fish.svg",
"Benzfish.svg",
"blue-fish.svg",
"drunken_duck_cartoon_globefish_kugelfisch.svg",
"Fish02.svg"
]
var numberOfFish
var fishIndex = -1
var currentLevel = 0
var numberOfLevel = 0
var items
function start(items_) {
items = items_
currentLevel = 0
numberOfLevel = items.levels.length
initLevel()
}
function stop() {
fishIndex = -1
}
function initLevel() {
items.bar.level = currentLevel + 1
items.chooseDiceBar.value1 = 0
items.chooseDiceBar.value2 = 0
items.chooseDiceBar.valueMax = items.levels[currentLevel].maxNumber
numberOfFish = items.levels[currentLevel].numberOfFish
fishIndex = 0
tuxIceBlockNumber = 0
items.tux.init()
calculateNextPlaceFishToReach()
placeFishToReach()
moveTuxToIceBlock()
- items.backgroundImg.source = items.resourceUrl + backgrounds[currentLevel % backgrounds.length]
items.clockPosition = 4
}
function moveTux() {
calculateTuxIceBlockNextPos()
if (tuxIceBlockNumberGoal > fishIndex)
{
items.clockPosition--
if (items.clockPosition === 0) {
lost()
return
}
}
else if (items.chooseDiceBar.value1 != 0 || items.chooseDiceBar.value2 != 0 ) {
moveTuxToNextIceBlock()
}
}
function moveTuxToNextIceBlock() {
tuxIsMoving = false
tuxIceBlockNumber++
tuxIceBlockNumber = tuxIceBlockNumber % iceBlocksLayout.length
if (tuxIceBlockNumber > 0 && tuxIceBlockNumber <= 4)
items.tux.rotation = -90
else if (tuxIceBlockNumber >= 5 && tuxIceBlockNumber <= 8)
items.tux.rotation = 0
else if (tuxIceBlockNumber >= 9 && tuxIceBlockNumber <= 12)
items.tux.rotation = 90
else if (tuxIceBlockNumber >= 13 && tuxIceBlockNumber <= 15)
items.tux.rotation = 180
moveTuxToIceBlock()
var fishPos = fishIndex % iceBlocksLayout.length
//if tux reaches its position + dice number
if (tuxIceBlockNumber == fishPos) {
tuxIsMoving = false;
// if last fish reached
if (--numberOfFish == 0) {
won()
items.fishToReach.showParticles()
items.clockPosition++
return
}
items.audioEffects.play('qrc:/gcompris/src/activities/gnumch-equality/resource/eat.wav')
calculateNextPlaceFishToReach()
placeFishToReachBool = true
return
}
items.audioEffects.play(items.resourceUrl + 'icy_walk.wav')
//if tux reaches its position + dice number before reaching the fish, calculation was wrong
if (tuxIceBlockNumber == tuxIceBlockNumberGoal) {
items.clockPosition--
if (items.clockPosition === 0) {
lost()
return
}
tuxIsMoving = false;
return
}
tuxIsMoving = true
}
function moveTuxToIceBlock() {
items.tux.x = iceBlocksLayout[tuxIceBlockNumber % iceBlocksLayout.length][0] *
- items.background.width / 5 +
- (items.background.width / 5 - items.tux.width) / 2
+ items.widthBase + (items.widthBase - items.tux.width) / 2
items.tux.y = iceBlocksLayout[tuxIceBlockNumber % iceBlocksLayout.length][1] *
- (items.background.height - items.background.height/5) / 5 +
- (items.background.height / 5 - items.tux.height) / 2
+ items.heightBase + (items.heightBase - items.tux.height) / 2
}
function tuxRunningChanged() {
if (tuxIsMoving) {
moveTuxToNextIceBlock()
} else {
if (placeFishToReachBool == true) {
placeFishToReach(fishIndex)
placeFishToReachBool = false
}
}
}
function calculateTuxIceBlockNextPos() {
tuxIceBlockNumberGoal = tuxIceBlockNumber +
items.chooseDiceBar.value1 + items.chooseDiceBar.value2
// Increase Tux's speed depending on the number of blocks to move
items.tux.duration = 1000 -
(items.chooseDiceBar.value1 + items.chooseDiceBar.value2) * 40
}
var previousFishIndex = 0
function calculateNextPlaceFishToReach() {
var newFishIndex
do {
newFishIndex = Math.floor(Math.random() *
(items.levels[currentLevel].maxNumber * 2 -
items.levels[currentLevel].minNumber + 1)) +
items.levels[currentLevel].minNumber
} while((previousFishIndex === newFishIndex) || (newFishIndex >= iceBlocksLayout.length))
previousFishIndex = newFishIndex
fishIndex = tuxIceBlockNumber + newFishIndex
}
function placeFishToReach() {
// placeFishToReach can be called when the opacity is 0.
// In this case, this does not trigger the onOpacityChanged of the fish Image (meaning the fish will not be displayed) so we directly set the opacity to 1.
if(items.fishToReach.opacity == 0)
items.fishToReach.opacity = 1
else
items.fishToReach.opacity = 0
- items.fishToReach.nextSource = items.resourceUrl + fishes[fishIndex % fishes.length]
items.fishToReach.nextX = iceBlocksLayout[fishIndex % iceBlocksLayout.length][0] *
- items.background.width / 5 +
- (items.background.width / 5 - items.tux.width) / 2
+ items.widthBase + (items.widthBase - items.fishToReach.width) / 2
items.fishToReach.nextY = iceBlocksLayout[fishIndex % iceBlocksLayout.length][1] *
- (items.background.height - items.background.height/5) / 5 +
- (items.background.height / 5 - items.tux.height) / 2
+ items.heightBase + (items.heightBase - items.fishToReach.height) / 2
}
function nextLevel() {
if(numberOfLevel <= ++currentLevel) {
currentLevel = 0
}
initLevel();
}
function previousLevel() {
if(--currentLevel < 0) {
currentLevel = numberOfLevel - 1
}
initLevel();
}
function lost() {
items.bonus.bad("tux")
}
function won() {
items.bonus.good("flower")
}
diff --git a/src/activities/reversecount/reversecount.svg b/src/activities/reversecount/reversecount.svg
index 62e1e807a..f88d8bddb 100644
--- a/src/activities/reversecount/reversecount.svg
+++ b/src/activities/reversecount/reversecount.svg
@@ -1,465 +1,452 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.92.1 r15371"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
version="1.0"
sodipodi:docname="reversecount.svg">
<defs
id="defs4">
<linearGradient
gradientTransform="matrix(1,0,0,1.0859179,0,-53.897354)"
gradientUnits="userSpaceOnUse"
y2="650.04968"
x2="945.6795"
y1="637.41199"
x1="940.9632"
id="linearGradient4503"
xlink:href="#linearGradient4497"
inkscape:collect="always" />
<linearGradient
id="linearGradient4497"
inkscape:collect="always">
<stop
id="stop4499"
offset="0"
style="stop-color:#275eb1;stop-opacity:1" />
<stop
id="stop4501"
offset="1"
style="stop-color:#e6ecf9;stop-opacity:1" />
</linearGradient>
<linearGradient
gradientTransform="matrix(-1,0,0,1.0859179,1919.9978,-53.897354)"
gradientUnits="userSpaceOnUse"
y2="650.04968"
x2="945.6795"
y1="637.41199"
x1="940.9632"
id="linearGradient4503-2"
xlink:href="#linearGradient4497"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.8634092"
- inkscape:cx="-36.169819"
- inkscape:cy="51.353514"
+ inkscape:cx="-18.009648"
+ inkscape:cy="-78.21232"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="100px"
height="100px"
inkscape:window-width="1884"
inkscape:window-height="1051"
inkscape:window-x="0"
inkscape:window-y="0"
showgrid="false"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
<dc:date>2015</dc:date>
<dc:creator>
<cc:Agent>
<dc:title>Timothée Giet</dc:title>
</cc:Agent>
</dc:creator>
<cc:license
rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
<cc:License
rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
<cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" />
<cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
<cc:requires
rdf:resource="http://creativecommons.org/ns#ShareAlike" />
</cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
<g
transform="matrix(0.17306643,0,0,0.17306643,-36.673612,-30.052924)"
id="layer1-6"
inkscape:label="Calque 1">
<path
sodipodi:nodetypes="csszszcc"
inkscape:connector-curvature="0"
id="path3775-3"
d="m 402.557,627.34124 c 15.45599,-0.1269 60.59179,16.71024 59.13369,23.10393 -0.3799,1.66622 -16.1722,7.30674 -22.2907,10.18897 -3.4918,1.64489 1.6432,6.65255 -1.6045,7.05293 -3.2477,0.40038 -12.1021,-3.21282 -19.2145,-3.70297 -9.1385,-0.62978 -26.50988,1.9625 -30.38541,1.57616 -3.87552,-0.38633 -8.97404,-28.10646 -6.81057,-29.11119 6.42101,-2.95779 16.60439,-8.77075 21.17199,-9.10783 z"
style="display:inline;opacity:0.98999999;fill:#a78014;fill-opacity:1;stroke:none" />
<path
sodipodi:nodetypes="csszszcc"
inkscape:connector-curvature="0"
id="path3775"
d="m 329.45449,627.34203 c -15.45599,-0.1269 -60.59178,16.71024 -59.13375,23.10393 0.37997,1.66622 16.17224,7.30674 22.29073,10.18897 3.49182,1.64489 -1.64324,6.65255 1.60449,7.05293 3.24772,0.40038 12.10216,-3.21282 19.2145,-3.70297 9.13848,-0.62978 26.50991,1.9625 30.38544,1.57616 3.87552,-0.38633 8.97404,-28.10646 6.81057,-29.11119 -6.42101,-2.95779 -16.60435,-8.77075 -21.17198,-9.10783 z"
style="display:inline;fill:#a78014;fill-opacity:1;stroke:none" />
<g
transform="translate(-594.61442,-196.85364)"
id="g4667"
style="display:inline">
<path
style="display:inline;fill:#e2a70e;fill-opacity:1;stroke:none"
d="m 921.34614,828.77469 c -13.48149,-0.11069 -52.85117,12.57551 -51.57941,18.1524 0.33143,1.45336 14.10624,4.3733 19.44309,6.88733 3.04574,1.43475 0.31118,5.80268 3.14402,6.15192 2.83282,0.34923 8.8116,-2.80239 15.01534,-3.22992 7.97104,-0.54933 25.12326,1.9673 28.5037,1.63031 3.38042,-0.33698 3.8276,-22.77136 1.94051,-23.64774 -5.60072,-2.57993 -12.48314,-5.65028 -16.46725,-5.9443 z"
id="path3775-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csszszcc" />
<path
style="display:inline;fill:#e2a70e;fill-opacity:1;stroke:none"
d="m 999.3113,828.77469 c 13.4815,-0.11069 52.8512,12.57551 51.5794,18.1524 -0.3314,1.45336 -14.1062,4.3733 -19.4431,6.88733 -3.0457,1.43475 -0.3112,5.80268 -3.144,6.15192 -2.8328,0.34923 -8.8116,-2.80239 -15.0153,-3.22992 -7.9711,-0.54933 -25.12331,1.9673 -28.50375,1.63031 -3.38042,-0.33698 -3.8276,-22.77136 -1.94051,-23.64774 5.60072,-2.57993 12.48316,-5.65028 16.46726,-5.9443 z"
id="path3775-9-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csszszcc" />
</g>
<g
transform="translate(-594.28572,-196.85364)"
style="display:inline;fill:#2a2a2a;fill-opacity:1"
id="g4602">
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2a2a2a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate"
d="m 1047.5807,761.80244 c 0,48.36946 -39.2113,87.58066 -87.58072,87.58066 -48.36945,0 -87.58065,-39.2112 -87.58065,-87.58066 0,-24.18473 13.8028,-71.40879 29.65178,-112.58666 15.84898,-41.17788 25.49178,-72.49935 59.03328,-72.49935 33.54151,0 40.97541,31.32147 56.82441,72.49935 15.849,41.17787 29.6519,88.40193 29.6519,112.58666 z"
id="path2992"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ssszzzs" />
<path
style="fill:#2a2a2a;fill-opacity:1;stroke:none"
d="m 1037.6216,728.00614 c 23.716,-0.38105 55.6572,10.63018 59.7453,12.83874 10.9697,-19.99218 -50.0446,-46.77657 -71.2956,-65.89171 -12.1316,-10.91225 6.4731,51.31353 11.5503,53.05297 z"
id="path3807"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccsc" />
<path
style="display:inline;fill:#2a2a2a;fill-opacity:1;stroke:none"
d="m 882.37842,728.00614 c -23.716,-0.38105 -55.6572,10.63018 -59.7453,12.83874 -10.9697,-19.99218 50.0446,-46.77657 71.2956,-65.89171 12.1316,-10.91225 -6.4731,51.31353 -11.5503,53.05297 z"
id="path3807-7"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccsc" />
</g>
<path
sodipodi:nodetypes="sssss"
inkscape:connector-curvature="0"
id="path3829"
d="m 426.85729,547.62604 c 0,38.44108 -26.2701,67.60375 -61.14303,67.60375 -34.8729,0 -61.14297,-29.16267 -61.14297,-67.60375 0,-38.44109 26.27007,-75.60375 61.14297,-75.60375 34.87293,0 61.14303,37.16266 61.14303,75.60375 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="szszs"
inkscape:connector-curvature="0"
id="path3792"
d="m 404.38759,489.32906 c 0,7.97791 -22.81369,28.56754 -38.67333,28.56754 -15.85964,0 -38.67338,-21.38032 -38.67338,-28.56754 0,-6.377 17.31467,-23.90146 38.67338,-23.90146 21.35873,0 38.67333,17.00327 38.67333,23.90146 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b28b16;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="szszs"
inkscape:connector-curvature="0"
id="path3792-7"
d="m 399.06482,489.65017 c 0,6.87987 -19.67375,24.63567 -33.35056,24.63567 -13.67682,0 -33.35061,-18.43766 -33.35061,-24.63567 0,-5.49931 11.32081,-22.61181 33.35061,-22.61181 22.0298,0 33.35056,16.66304 33.35056,22.61181 z"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f1c43c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="ccsccsc"
inkscape:connector-curvature="0"
id="path3803"
d="m 328.43301,490.14636 -0.0625,0.71875 c 0,0 16.04366,16.65625 37.34375,16.65625 21.30009,0 37.34375,-16.65625 37.34375,-16.65625 l -0.0625,-0.71875 c 0,0 -16.50458,15.32236 -37.28125,15.32236 -20.77667,0 -37.28125,-15.32236 -37.28125,-15.32236 z"
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#b28b16;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate" />
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#b28b16;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate" />
<g
transform="translate(-594.25403,-196.85364)"
id="g4625"
style="display:inline">
<path
style="fill:#f2f2f5;fill-opacity:1;stroke:none"
d="m 939.0157,625.16734 c 8.22345,-3.27448 13.36227,12.73386 11.8014,21.21012 -1.56086,8.47625 -9.50431,12.46262 -16.2504,5.30623 -6.7461,-7.15639 -3.77445,-23.24187 4.449,-26.51635 z"
id="path2999"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzzz" />
<path
style="display:inline;fill:url(#linearGradient4503);fill-opacity:1;stroke:none"
d="m 942.97212,636.2935 c 6.98855,-0.19342 7.86724,17.20381 1.52621,16.26008 -6.34105,-0.94375 -8.51478,-16.06661 -1.52621,-16.26008 z"
id="path3769-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="fill:#171717;fill-opacity:1;stroke:none"
d="m 943.91329,641.70876 c 2.94998,-0.0863 3.32089,7.67564 0.64424,7.25458 -2.67665,-0.42106 -3.59422,-7.16827 -0.64424,-7.25458 z"
id="path3769"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="display:inline;fill:#f2f2f5;fill-opacity:1;stroke:none"
d="m 980.92095,625.16734 c -8.22345,-3.27448 -13.36227,12.73386 -11.8014,21.21012 1.56086,8.47625 9.50431,12.46262 16.2504,5.30623 6.7461,-7.15639 3.77445,-23.24187 -4.449,-26.51635 z"
id="path2999-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzzz" />
<path
style="display:inline;fill:url(#linearGradient4503-2);fill-opacity:1;stroke:none"
d="m 977.02571,636.2935 c -6.98855,-0.19342 -7.86724,17.20381 -1.52621,16.26008 6.34105,-0.94375 8.51478,-16.06661 1.52621,-16.26008 z"
id="path3769-9-5"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="display:inline;fill:#171717;fill-opacity:1;stroke:none"
d="m 976.08665,641.70876 c -2.94998,-0.0863 -3.32089,7.67564 -0.64424,7.25458 2.67665,-0.42106 3.59422,-7.16827 0.64424,-7.25458 z"
id="path3769-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="display:inline;fill:#ffffff;fill-opacity:0.90232556;stroke:none"
d="m 941.32961,639.49936 c 2.59421,-0.0649 2.92038,5.77001 0.56654,5.45349 -2.35384,-0.31653 -3.16075,-5.38861 -0.56654,-5.45349 z"
id="path3769-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="display:inline;fill:#ffffff;fill-opacity:0.76744187;stroke:none"
d="m 942.09935,645.81792 c 1.70477,-0.0343 1.91911,3.04768 0.3723,2.88049 -1.54682,-0.16719 -2.07708,-2.84622 -0.3723,-2.88049 z"
id="path3769-2-0"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="display:inline;fill:#ffffff;fill-opacity:0.90232556;stroke:none"
d="m 974.66822,639.49936 c -2.59421,-0.0649 -2.92038,5.77001 -0.56654,5.45349 2.35384,-0.31653 3.16075,-5.38861 0.56654,-5.45349 z"
id="path3769-2-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
<path
style="display:inline;fill:#ffffff;fill-opacity:0.76744187;stroke:none"
d="m 973.89848,645.81792 c -1.70477,-0.0343 -1.91911,3.04768 -0.3723,2.88049 1.54682,-0.16719 2.07708,-2.84622 0.3723,-2.88049 z"
id="path3769-2-0-2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="zzz" />
</g>
</g>
<g
- transform="matrix(0.44773562,0,0,0.44773562,46.002778,53.531599)"
- inkscape:label="Calque 1"
- id="layer1-1">
+ id="g902">
<path
- style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8419742px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 63.726064,29.937747 C 58.6456,30.725204 51.403169,33.599916 46.564095,36.936301 41.725021,40.272687 41.507385,48.333091 36.695168,48.243086 31.88295,48.15308 32.761783,41.52088 29.520142,38.749571 26.278501,35.978261 20.057337,33.62974 15.792119,32.877138 9.1015754,32.227362 0.2722508,34.416024 3.3351054,41.569676 c 1.090021,2.536319 7.0255276,2.598526 10.2673906,5.733032 3.241863,3.134506 6.729106,4.791005 7.464818,10.454291 0.735713,5.663286 -1.167327,11.680527 -4.537971,16.27533 -3.633567,5.371758 -15.83409816,6.845353 -11.7301259,13.655012 1.0788342,3.162513 14.9003079,0.698728 20.5408799,-2.340519 5.640573,-3.039247 5.214643,-14.528996 11.715061,-14.161741 6.500419,0.367255 6.340635,8.280168 10.634312,11.766714 4.293676,3.486545 8.439228,6.410984 14.348533,7.138525 5.909304,0.727541 13.904546,-1.494467 19.236878,-4.234125 5.332332,-2.739658 9.240122,-5.601067 12.097784,-10.882752 2.857662,-5.281686 3.43355,-13.898204 3.024445,-19.525966 C 95.988004,49.819715 95.588543,46.500436 92.24729,41.975259 88.906038,37.450083 81.024841,32.6873 75.999685,30.917544 70.97453,29.147787 68.806529,29.150289 63.726064,29.937747 Z"
- id="path49949-6"
- sodipodi:nodetypes="zzzzcczzcczzzzzzzzzz"
- inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0"
+ id="rect4896-3"
+ d="M 61.052611,23.682225 71.566766,26.801812 56.93899,52.922698 46.384752,47.980873 Z"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ebd9c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.31647754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
- style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 79.158338,34.055655 C 78.879842,29.236503 71.709396,17.964698 68.642477,18.136811 c -1.375933,0.07722 -29.60136,11.88731 -28.886911,13.769007 0.532796,1.403263 3.778816,11.737218 0.154587,15.262304 -2.880564,2.801763 30.701761,-16.038381 39.248185,-13.112467 z"
- id="path4205-7"
+ sodipodi:nodetypes="ccccscccc"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssc" />
+ id="path4894-4"
+ d="M 73.070209,26.687147 57.805576,53.702838 56.942928,53.622193 45.020249,47.750477 c -0.0282,0.687332 0.526852,2.395783 0.783553,2.939199 0.308298,0.652646 9.420884,4.462315 11.228493,4.830857 0.310863,0.06809 0.732256,0.128516 1.270184,-0.280643 5.493217,-8.022274 9.995332,-17.002599 14.764988,-25.566956 0.116165,-0.764197 0.233392,-2.384408 0.0028,-2.985787 z"
+ style="fill:#a4572e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.55274624px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="ccccccccscccscccccccccccccccccccccccscc"
+ style="fill:#df773f;fill-opacity:1;stroke-width:0.55274624"
+ inkscape:connector-curvature="0"
+ d="m 52.679499,35.067008 c -3.689428,6.012324 -6.881533,11.218372 -7.047487,11.56665 -0.366957,0.775384 -0.158869,1.256648 0.863255,2.055403 1.002036,0.756513 9.643605,4.615299 10.546292,4.683432 0.346753,0.032 0.835217,-0.117356 1.077926,-0.325992 0.501897,-0.404396 14.464121,-24.862916 14.712078,-25.757849 0.210826,-0.711518 -0.463445,-1.955394 -1.2682,-2.31875 -0.725926,-0.328305 -10.122594,-2.201467 -10.585294,-2.085086 -0.189097,0.0381 -0.613698,0.343578 -0.946586,0.667618 -0.332889,0.324039 -3.633192,5.498644 -7.351984,11.514574 z m 8.376926,-8.748631 c 0.754864,-0.286368 1.442143,0.0914 1.328701,0.746251 -0.150564,0.838271 -1.544893,1.501191 -2.138386,1.037394 -0.313232,-0.244783 -0.304379,-0.901711 -0.02454,-1.293768 0.103068,-0.131885 0.479735,-0.34205 0.834241,-0.489877 z m 1.992989,3.682537 c 1.294319,-0.26311 1.377062,1.262007 0.06562,1.750792 -0.725494,0.282765 -1.119628,0.10753 -1.211769,-0.522105 -0.06636,-0.662604 0.301561,-1.065471 1.14606,-1.228683 z m 1.765789,3.531536 c 0.416848,-0.125661 0.616751,-0.07566 0.816109,0.212907 0.545016,0.797667 -0.03528,1.778085 -1.112655,1.865526 -0.574501,0.05556 -0.732155,-0.01454 -0.896463,-0.381914 -0.248269,-0.565767 0.388691,-1.448798 1.193009,-1.696519 z m -10.65429,4.497903 c 2.509912,0.400097 -1.238185,3.740816 -1.311465,1.338407 0.0089,-0.656928 0.619492,-1.268431 1.311465,-1.338407 z m -2.931192,7.454582 c -0.581269,0.607902 -1.339192,0.626345 -1.695654,0.02915 -0.447742,-3.082292 3.36677,-1.882508 1.695654,-0.02915 z m 8.254404,-5.737587 c 1.077379,-0.08745 1.436895,0.777689 0.715432,1.700896 -2.149011,1.826887 -2.569766,-1.422834 -0.715432,-1.700896 z m -3.505457,5.810892 c 0.789365,-0.126643 1.066023,0.06301 1.159689,0.826599 0.154915,1.262873 -1.625363,2.181813 -2.384694,1.216669 -0.530602,-0.680191 0.200691,-1.887809 1.225005,-2.043268 z"
+ id="objDomino_6-6_matblack_p0001-4" />
<path
- style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 76.839528,34.522852 C 76.587657,30.194408 70.801765,20.764582 68.028051,20.91917 66.78366,20.988523 41.25665,31.59606 41.902796,33.286154 c 0.481859,1.260377 3.277744,8.737077 0,11.903223 -2.605175,2.516475 27.207366,-13.294509 34.936732,-10.666525 z"
- id="path4205"
+ sodipodi:nodetypes="cssssscsssccscccsssscccsssssssscscssssssccccssssscscccsssssscccccssssccsccssscssscscccc"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="csssc" />
+ id="objDomino_6-6_matblack_p0001-0-5"
+ d="m 60.846833,22.994702 c -0.171188,0.03539 -0.317502,0.131687 -0.498071,0.259833 -0.181771,0.128998 -0.377607,0.292209 -0.55255,0.462502 -0.08027,0.07813 -0.153726,0.183851 -0.284975,0.370789 -0.131249,0.18694 -0.302382,0.440354 -0.510148,0.753616 -0.415541,0.62652 -0.976284,1.492976 -1.642459,2.53668 -1.332341,2.087411 -3.087241,4.88552 -4.947096,7.894228 -1.844723,3.006181 -3.565257,5.811139 -4.845418,7.908077 -0.640078,1.048467 -1.170105,1.92006 -1.550764,2.551728 -0.190328,0.315835 -0.343694,0.571398 -0.454728,0.759949 -0.111034,0.18855 -0.173839,0.296797 -0.20735,0.367118 l -7.74e-4,8.85e-4 c -0.197487,0.41729 -0.252258,0.815551 -0.09274,1.19325 0.159523,0.377702 0.495658,0.713912 1.017592,1.121789 l 0.0018,0.0017 0.0018,7.74e-4 c 0.298719,0.225529 1.010432,0.592558 1.978718,1.063293 0.968298,0.470729 2.172157,1.026212 3.373222,1.560913 1.201067,0.534701 2.398674,1.048135 3.355166,1.432808 0.478241,0.192334 0.896364,0.352493 1.226175,0.467812 0.329459,0.115197 0.549235,0.187615 0.724767,0.200982 1.85e-4,1.5e-5 4.27e-4,-3.6e-5 8.29e-4,-3e-5 0.423778,0.03813 0.919101,-0.109103 1.230523,-0.375201 0.06767,-0.05528 0.07995,-0.08609 0.123386,-0.147491 0.04424,-0.06253 0.09901,-0.144554 0.164913,-0.246835 0.131818,-0.204559 0.308697,-0.48892 0.524391,-0.844438 0.431392,-0.711044 1.018788,-1.70373 1.710808,-2.886188 1.384041,-2.364913 3.184751,-5.488784 4.977182,-8.627802 1.792426,-3.139023 3.576428,-6.293502 4.928674,-8.71969 0.676123,-1.213098 1.244027,-2.244168 1.651427,-3.001083 0.203699,-0.37846 0.367501,-0.687996 0.484872,-0.919089 0.116953,-0.230263 0.181936,-0.350697 0.215289,-0.47026 0.131913,-0.447536 -0.01089,-0.97346 -0.271195,-1.450887 -0.260678,-0.478027 -0.64925,-0.911501 -1.114647,-1.12163 -0.134883,-0.061 -0.34903,-0.117725 -0.679613,-0.200957 -0.330583,-0.08324 -0.76028,-0.18337 -1.256606,-0.293617 -0.992655,-0.220494 -2.251568,-0.482438 -3.501764,-0.730091 -1.250198,-0.247652 -2.491593,-0.480911 -3.451861,-0.645786 -0.480134,-0.08244 -0.889518,-0.14743 -1.196759,-0.188771 -0.153618,-0.02067 -0.281723,-0.03579 -0.382887,-0.04372 -0.09852,-0.0077 -0.150917,-0.01846 -0.248998,0.0049 z m 0.09794,0.415345 c -0.04552,0.01145 0.03047,-2.83e-4 0.118139,0.0066 0.08767,0.0069 0.209499,0.02038 0.358518,0.04043 0.298043,0.0401 0.704422,0.104879 1.181635,0.186815 0.954425,0.163871 2.194229,0.397353 3.441781,0.64448 1.24755,0.24713 2.502941,0.507723 3.490784,0.727145 0.493925,0.109713 0.921578,0.209083 1.245632,0.290674 0.32405,0.08159 0.561869,0.154887 0.608464,0.175963 0.339358,0.153221 0.689667,0.523896 0.914671,0.936565 0.225003,0.412675 0.314077,0.863263 0.235961,1.126907 l 6.3e-5,0.0017 -7.74e-4,0.0018 c 0.0023,-0.0081 -0.07086,0.167378 -0.185498,0.393079 -0.114635,0.225705 -0.276574,0.532922 -0.479367,0.909691 -0.40558,0.753535 -0.973555,1.78392 -1.649104,2.995981 -1.351094,2.424118 -3.134458,5.577395 -4.926322,8.715422 -1.791858,3.13803 -3.592045,6.260776 -4.974824,8.623541 -0.691391,1.181377 -1.278479,2.172781 -1.707683,2.880218 -0.214599,0.353714 -0.390078,0.636422 -0.518047,0.83501 -0.06453,0.101117 -0.134661,0.198548 -0.202354,0.297573 -0.321881,0.31618 -0.547982,0.360086 -0.92137,0.277851 l -0.0017,6.2e-5 0.09129,0.01234 c -0.05005,-0.0038 -0.39042,-0.07959 -0.709893,-0.19129 -0.319471,-0.111705 -0.732194,-0.270169 -1.20669,-0.461001 C 54.199084,52.455908 53.00394,51.944028 51.806523,51.410949 50.609106,50.877874 49.408941,50.323918 48.446906,49.85623 47.485194,49.388698 46.74177,48.98918 46.539175,48.836335 l -8.29e-4,3e-5 c -0.497625,-0.389345 -0.776177,-0.693617 -0.884199,-0.949383 -0.108213,-0.256218 -0.08358,-0.485976 0.08544,-0.843467 l -3.1e-5,-8.29e-4 c 0.0082,-0.01712 0.08069,-0.147088 0.190198,-0.333049 0.109712,-0.186301 0.262427,-0.441365 0.452345,-0.756513 0.379835,-0.630303 0.909315,-1.501046 1.549183,-2.549166 1.279644,-2.096084 3.0001,-4.900488 4.844645,-7.906376 1.858937,-3.007227 3.613211,-5.804212 4.94394,-7.889095 0.665364,-1.042442 1.224585,-1.906971 1.637691,-2.529819 0.206554,-0.311427 0.376321,-0.562615 0.503802,-0.744185 0.12748,-0.18157 0.230683,-0.308347 0.233639,-0.311221 0.157946,-0.153746 0.340406,-0.305388 0.501433,-0.419664 0.161023,-0.114275 0.321928,-0.187979 0.338355,-0.19129 l 0.005,-9.95e-4 0.005,-9.95e-4 z"
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#94441a;fill-opacity:1;fill-rule:nonzero;stroke:#94441a;stroke-width:0.42783314;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
<path
- style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 60.366032,89.207426 c -2.899707,2.550811 -3.173054,7.727965 -9.372263,6.979297 L 30.853375,83.42458 c -4.074231,-3.62359 9.777502,-3.195918 12.164,-9.172788"
- id="path4173-3"
+ sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
+ id="path4964-7"
+ d="m 54.162878,34.722723 c 1.251582,0.05525 3.986082,1.017229 4.53286,1.298527 2.181054,1.073456 5.10109,1.844176 6.899006,2.793226 -0.08313,0.364692 -0.05785,0.243839 -0.303594,0.353702 -0.649402,-0.214416 -3.948298,-1.41482 -4.573303,-1.68553 -2.178817,-0.755427 -4.506409,-1.662448 -6.765813,-2.324381 -0.141945,-0.07016 0.07247,-0.29266 0.210844,-0.435544 z"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#94441a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.31647754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ </g>
+ <g
+ id="g971"
+ transform="translate(257.57396,-179.68923)">
<path
- style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 58.897765,85.845839 c -2.247923,1.977463 -3.541939,7.845993 -8.347715,7.265604 L 34.936732,83.217855 c -3.158442,-2.809114 8.661866,-3.559681 10.511937,-8.193126"
- id="path4173"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccc" />
+ sodipodi:nodetypes="zzzcccczzzzsccz"
+ id="path49949-6-3"
+ d="m -183.20748,246.70012 c -2.26898,0.35168 -5.50352,1.63555 -7.66469,3.12562 -2.16118,1.49005 -2.25837,5.0899 -4.40755,5.04971 -2.14918,-0.0402 -1.75669,-3.0022 -3.20444,-4.23989 -3.78005,-2.72132 -13.29302,-2.88583 -11.69447,1.25948 3.04195,2.2542 7.38154,3.68381 7.91936,7.22941 -0.31069,11.05011 -9.37334,8.6578 -7.26547,13.36716 0.48181,1.41241 5.63674,1.11181 9.17374,-1.48152 3.53699,-2.59333 2.3289,-6.05256 5.23205,-5.88854 2.90315,0.16402 2.83179,3.698 4.74938,5.25512 1.9176,1.55713 3.76904,2.86321 6.40819,3.18813 2.63915,0.32493 6.44952,-0.84282 8.69418,-2.30227 5.27962,-3.43275 7.26958,-7.69179 6.85655,-12.4498 -0.5649,-5.45822 -4.35885,-8.95888 -9.31532,-11.67503 -2.24428,-0.79039 -3.21253,-0.78927 -5.48151,-0.43758 z"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37603334px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8419742px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="m 62.616968,32.218036 c -4.692925,0.72739 -11.382902,3.382818 -15.85285,6.464703 -4.469948,3.081885 -6.098936,11.384212 -10.544076,11.301072 -4.44514,-0.08314 -4.347322,-5.923844 -7.34169,-8.483757 C 25.883984,38.940141 22.279303,35.628403 18.339437,34.93321 14.399571,34.238017 8.827595,35.570503 7.002049,37.325151 5.176504,39.079799 5.111797,38.4779 6.118671,40.820748 c 1.006874,2.342848 7.203595,2.828696 10.198168,5.724101 2.994573,2.895405 6.215808,6.13909 6.8954,11.370379 0.679592,5.231289 -2.077851,13.35985 -5.191381,17.60416 -3.11353,4.24431 -10.295262,4.648993 -10.980049,7.379588 -0.684788,2.730595 -1.13743,1.884154 1.715449,3.234681 2.85288,1.350527 9.765439,-0.211344 14.975747,-3.018756 5.210308,-2.807412 8.243956,-14.705878 14.248521,-14.366637 6.004565,0.339241 5.856969,9.219303 9.823123,12.439894 3.966154,3.220591 7.795482,5.921953 13.254023,6.593997 5.458541,0.672044 12.843904,-1.380469 17.769484,-3.911145 4.92558,-2.530676 8.535283,-5.173816 11.174962,-10.052613 C 92.641797,68.9396 93.173756,60.980352 92.795857,55.781877 92.417958,50.583402 92.048968,47.517319 88.962587,43.337324 85.876206,39.157329 78.596189,34.757853 73.954354,33.123094 69.312519,31.488335 67.309893,31.490646 62.616968,32.218036 Z"
- id="path49949-2"
- sodipodi:nodetypes="zzzzzzzzzzzzzzzzzzzzzz"
- inkscape:connector-curvature="0" />
+ sodipodi:nodetypes="csssc"
+ inkscape:connector-curvature="0"
+ id="path4205-7-6"
+ d="m -176.31529,248.53921 c -0.12437,-2.15227 -3.32676,-7.18637 -4.69647,-7.1095 -0.61451,0.0345 -13.22024,5.30898 -12.90116,6.14937 0.23795,0.62671 1.68765,5.24194 0.069,6.81628 -1.28649,1.25129 13.71168,-7.16289 17.52859,-5.85615 z"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eaeef3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4222"
- sodipodi:type="arc"
- sodipodi:cx="86.578522"
- sodipodi:cy="54.310028"
- sodipodi:rx="4.7922068"
- sodipodi:ry="7.8839526"
- sodipodi:start="0.14344896"
- sodipodi:end="0.14048923"
+ sodipodi:nodetypes="csssc"
+ inkscape:connector-curvature="0"
+ id="path4205-75"
+ d="m -177.35089,248.74787 c -0.11248,-1.93313 -2.69652,-6.14457 -3.93528,-6.07553 -0.55576,0.031 -11.95635,4.76839 -11.66778,5.52321 0.2152,0.56289 1.46387,3.90205 0,5.31608 -1.16349,1.12388 12.15106,-5.93745 15.60306,-4.76376 z"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path4173-3-3"
+ d="m -184.7081,273.1705 c -1.29504,1.13921 -1.41712,3.45138 -4.18574,3.11701 l -8.99488,-5.69969 c -1.81959,-1.61832 4.36672,-1.42732 5.43255,-4.09665"
+ style="fill:#193e76;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ sodipodi:nodetypes="cccc"
+ inkscape:connector-curvature="0"
+ id="path4173-5"
+ d="m -185.36384,271.66918 c -1.00394,0.88315 -1.58186,3.50409 -3.72817,3.24489 l -6.97305,-4.41857 c -1.41059,-1.25458 3.86847,-1.58979 4.69473,-3.65913"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.44660908px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="zzzscsczzzzcccz"
+ id="path49949-2-6"
+ d="m -183.70281,247.71851 c -2.0959,0.32486 -5.08371,1.5108 -7.08003,2.8872 -1.99632,1.3764 -2.72384,5.08429 -4.70908,5.04716 -1.98524,-0.0371 -1.98998,-2.17723 -2.84264,-3.71622 -2.36969,-4.27712 -12.52933,-2.39877 -10.89172,-0.37609 2.64595,2.82543 7.59721,3.60516 7.48873,7.56185 -0.26862,9.79816 -7.29627,9.53658 -6.78444,12.02551 0.51182,2.48894 4.54419,1.28246 7.5255,-0.48029 2.98132,-1.76275 3.60913,-6.78589 6.29082,-6.63438 2.68169,0.15151 2.61577,4.11742 4.38709,5.55577 1.77133,1.43834 3.48154,2.6448 5.91937,2.94494 2.43784,0.30014 5.73621,-0.61653 7.93602,-1.74676 4.4771,-2.42012 7.62899,-7.1638 7.36956,-12.13358 -0.73732,-4.97818 -4.90028,-8.82681 -9.5458,-10.5309 -2.07309,-0.7301 -2.96748,-0.72906 -5.06338,-0.40421 z"
+ style="fill:#3f86f1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37603334px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <path
+ d="m -170.8831,258.08835 a 2.1402433,3.521045 0 0 1 -2.42265,2.98189 2.1402433,3.521045 0 0 1 -1.81432,-3.98345 2.1402433,3.521045 0 0 1 2.41997,-2.98779 2.1402433,3.521045 0 0 1 1.8179,3.97903"
sodipodi:open="true"
- d="m 91.321507,55.437098 a 4.7922068,7.8839526 0 0 1 -5.424557,6.676737 4.7922068,7.8839526 0 0 1 -4.062422,-8.919328 4.7922068,7.8839526 0 0 1 5.418545,-6.689937 4.7922068,7.8839526 0 0 1 4.070441,8.909429" />
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="3.521045"
+ sodipodi:rx="2.1402433"
+ sodipodi:cy="257.58499"
+ sodipodi:cx="-173.00136"
+ sodipodi:type="arc"
+ id="path4222-2"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#eaeef3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<g
- id="g4260"
- transform="translate(0,18)">
- <path
- sodipodi:nodetypes="cccccc"
- id="path54402-7"
- d="m 49.65685,13.293398 3.406083,3.032647 -3.530452,5.04186 -4.21996,1.454291 -1.140036,-6.44692 5.484365,-3.081878 z"
- style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cccccc"
- id="path54404-0"
- d="m 64.039825,8.8520949 2.665115,3.7007451 -4.542344,4.153499 -4.43522,0.501842 0.289154,-6.540554 6.023295,-1.8155321 z"
- style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ transform="matrix(0.44660911,0,0,0.44660911,-211.66812,241.36861)"
+ id="g4260-9">
<path
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc"
- id="path54408-9"
- d="m 42.521663,68.662191 -1.971685,-2.39521 2.584894,-5.346975 4.067247,-1.838621 1.731828,6.313733 -6.412284,3.267073 z"
- style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 52.831299,11.909664 0.231634,4.416381 -6.542108,3.820918 2.372635,-5.969382 z"
+ id="path54402-7-1"
+ sodipodi:nodetypes="ccccc" />
<path
inkscape:connector-curvature="0"
- sodipodi:nodetypes="cccccc"
- id="path54410-3"
- d="m 51.421497,72.327068 -3.672145,-2.240622 3.048656,-6.119912 4.067247,-1.838621 2.19559,5.386209 -5.639348,4.812946 z"
- style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 64.284013,7.2241726 2.9907,7.2007784 c -2.5237,0.293465 -7.104296,0.674768 -8.65198,1.155308 L 58.260718,9.7722697 Z"
+ id="path54404-0-2"
+ sodipodi:nodetypes="ccccc" />
<path
- sodipodi:nodetypes="ccccsccccccccc"
- id="path50840-6"
- d="m 54.642546,19.043977 0.219483,3.926793 -5.195237,8.57014 3.296086,10.299103 c 0,0 -1.924109,4.009031 -2.721468,9.492381 -0.797359,5.48335 -1.474778,10.928897 -0.99502,10.77769 l 5.199252,2.638837 1.631096,-10.407208 -1.245633,-3.962216 4.089698,-7.63952 -2.957937,-13.583951 2.991125,-2.222447 -0.0017,-9.377463 -4.309752,1.487861 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 42.684455,67.522645 -1.483308,-1.255664 3.643043,-6.649313 c 0,0 1.393462,1.850702 3.995219,3.87615 z"
+ id="path54408-9-7"
+ sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0" />
<path
- sodipodi:nodetypes="ccccsccccccccc"
- id="path54390-0"
- d="m 66.870433,15.60753 -1.122931,6.446994 -3.685022,9.242193 3.296086,10.299103 c 0,0 -1.924108,4.009031 -2.721467,9.49238 -0.797359,5.48335 -0.971373,17.313405 -0.491615,17.162198 l 5.534855,-1.393484 0.792087,-12.759394 1.439195,-4.130229 1.404871,-7.471508 -2.957937,-13.583951 1.480909,-2.8945 2.011928,-10.049516 -4.980959,-0.360286 z"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 50.363347,72.08288 -2.613995,-1.996434 3.537033,-5.224555 c 0,0 2.685402,2.326361 4.623345,3.3429 z"
+ id="path54410-3-0"
+ sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0" />
<path
- sodipodi:nodetypes="cccccccccccc"
- id="path54392-6"
- d="m 79.341384,19.626574 -2.129742,5.438914 -3.349418,22.011208 0.611259,10.803143 c 0,0 3.445546,1.824857 4.494005,6.97218 l 4.157311,-4.719295 -4.937271,-5.138309 0.398061,-9.319655 2.243916,-12.743884 0.138496,-5.078674 4.193351,-4.337061 -5.819968,-3.888567 z"
+ inkscape:connector-curvature="0"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ d="m 54.642546,19.043977 c -5.723723,13.28725 -6.281067,31.809085 -5.396156,43.066107 l 5.199252,2.638837 C 55.893887,47.684747 58.95521,33.655899 58.952291,17.556116 l -4.309752,1.487861 z"
+ id="path50840-6-9"
+ sodipodi:nodetypes="cccccc" />
<path
- sodipodi:nodetypes="cccccccccc"
- id="path54394-2"
- d="m 45.107658,25.016137 2.633146,6.278981 -3.530452,5.04186 2.073568,9.291023 c 0,0 -0.592916,6.361217 -1.641375,11.50854 l -4.828518,-6.063401 1.077831,-6.482417 -0.901466,-6.799454 -0.367099,-7.374444 5.484365,-5.400688 z"
+ inkscape:connector-curvature="0"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ d="m 66.870433,15.60753 c -0.611634,7.921003 -7.337926,35.515477 -4.724949,52.642868 l 5.534855,-0.127258 c 3.549198,-17.698408 0.715164,-34.893271 4.171053,-52.155324 z"
+ id="path54390-0-3"
+ sodipodi:nodetypes="ccccc" />
<path
- sodipodi:nodetypes="ccccccccccc"
- id="path54396-6"
- d="m 19.433996,19.471695 9.009612,5.102888 6.705452,17.810874 -3.296086,12.14725 c 0,0 -3.445546,3.168965 -6.507626,6.46814 l 1.283365,-9.017537 2.790172,-9.487668 -2.915123,-10.05567 -2.655521,-7.598875 -10.234213,-5.177128 5.819968,-0.192274 z"
+ inkscape:connector-curvature="0"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ d="m 81.873837,19.856797 c -8.24855,16.2556 -8.363773,33.390058 -2.906349,44.995222 L 82.43413,62.434954 C 75.529554,54.680095 76.854091,29.904202 84.700906,21.788469 Z"
+ id="path54392-6-6"
+ sodipodi:nodetypes="ccccc" />
<path
- sodipodi:nodetypes="cccccc"
- id="path54412-1"
- d="m 10.146685,67.071099 -1.5079226,-2.395209 4.5945296,-2.873578 3.912659,-2.766145 1.886416,6.777495 -8.885682,1.257437 z"
+ inkscape:connector-curvature="0"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ d="m 44.212301,25.178929 c 1.61736,9.439495 2.224593,20.16 0.186056,30.411086 L 40.3838,50.096387 C 42.089675,43.259508 39.806171,38.418943 39.460501,31.474975 Z"
+ id="path54394-2-0"
+ sodipodi:nodetypes="ccccc" />
<path
- sodipodi:nodetypes="ccccc"
- id="path54414-8"
- d="M 8.9872804,19.461816 8.0977067,23.093723 12.073887,25.039777 11.225708,19.637141 8.9872804,19.461816 Z"
+ inkscape:connector-curvature="0"
style="fill:#f0cb38;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- inkscape:connector-curvature="0" />
+ d="m 28.387569,24.19267 c 6.70678,10.719212 7.418831,15.393452 4.604951,27.735361 0,0 -3.038566,5.610849 -6.100646,8.910024 6.94787,-20.398454 4.209197,-27.930707 -4.649858,-41.174086 z"
+ id="path54396-6-6"
+ sodipodi:nodetypes="ccccc" />
</g>
<path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#214f8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4224-5"
- sodipodi:type="arc"
- sodipodi:cx="88.433578"
- sodipodi:cy="54.068512"
- sodipodi:rx="2.4476323"
- sodipodi:ry="4.0965638"
- sodipodi:start="0.14344896"
- sodipodi:end="0.14048923"
+ d="m -171.09097,257.73869 a 1.0931349,1.8295627 0 0 1 -1.23738,1.54942 1.0931349,1.8295627 0 0 1 -0.92667,-2.06984 1.0931349,1.8295627 0 0 1 1.23601,-1.55247 1.0931349,1.8295627 0 0 1 0.92849,2.06753"
sodipodi:open="true"
- d="m 90.856071,54.654146 a 2.4476323,4.0965638 0 0 1 -2.770607,3.469285 2.4476323,4.0965638 0 0 1 -2.074893,-4.634553 2.4476323,4.0965638 0 0 1 2.767537,-3.476143 2.4476323,4.0965638 0 0 1 2.078988,4.629409" />
- <path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1f2a38;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4224"
- sodipodi:type="arc"
- sodipodi:cx="88.356285"
- sodipodi:cy="54.454979"
- sodipodi:rx="1.7777541"
- sodipodi:ry="2.7825716"
- sodipodi:start="0.14344896"
sodipodi:end="0.14048923"
- sodipodi:open="true"
- d="m 90.11578,54.852768 a 1.7777541,2.7825716 0 0 1 -2.012336,2.356496 1.7777541,2.7825716 0 0 1 -1.507028,-3.147999 1.7777541,2.7825716 0 0 1 2.010106,-2.361154 1.7777541,2.7825716 0 0 1 1.510002,3.144505" />
- <path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4241"
- sodipodi:type="arc"
- sodipodi:cx="87.096687"
- sodipodi:cy="55.946457"
- sodipodi:rx="1.2366985"
- sodipodi:ry="1.3912858"
sodipodi:start="0.14344896"
- sodipodi:end="0.14048923"
- sodipodi:open="true"
- d="m 88.320683,56.145352 a 1.2366985,1.3912858 0 0 1 -1.399885,1.178247 1.2366985,1.3912858 0 0 1 -1.048367,-1.573999 1.2366985,1.3912858 0 0 1 1.398334,-1.180577 1.2366985,1.3912858 0 0 1 1.050436,1.572252" />
- <path
- style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
- id="path4241-3"
+ sodipodi:ry="1.8295627"
+ sodipodi:rx="1.0931349"
+ sodipodi:cy="257.47714"
+ sodipodi:cx="-172.17288"
sodipodi:type="arc"
- sodipodi:cx="86.901237"
- sodipodi:cy="59.409981"
- sodipodi:rx="0.58084011"
- sodipodi:ry="0.73542732"
- sodipodi:start="0.14344896"
- sodipodi:end="0.14048923"
- sodipodi:open="true"
- d="m 87.476112,59.515116 a 0.58084011,0.73542732 0 0 1 -0.657485,0.622816 0.58084011,0.73542732 0 0 1 -0.492386,-0.832009 0.58084011,0.73542732 0 0 1 0.656756,-0.624047 0.58084011,0.73542732 0 0 1 0.493358,0.831085" />
- </g>
- <g
- id="g902">
+ id="path4224-5-2"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#214f8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0"
- id="rect4896-3"
- d="M 61.052611,23.682225 71.566766,26.801812 56.93899,52.922698 46.384752,47.980873 Z"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ebd9c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.31647754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
- <path
- sodipodi:nodetypes="ccccscccc"
- inkscape:connector-curvature="0"
- id="path4894-4"
- d="M 73.070209,26.687147 57.805576,53.702838 56.942928,53.622193 45.020249,47.750477 c -0.0282,0.687332 0.526852,2.395783 0.783553,2.939199 0.308298,0.652646 9.420884,4.462315 11.228493,4.830857 0.310863,0.06809 0.732256,0.128516 1.270184,-0.280643 5.493217,-8.022274 9.995332,-17.002599 14.764988,-25.566956 0.116165,-0.764197 0.233392,-2.384408 0.0028,-2.985787 z"
- style="fill:#a4572e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.55274624px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="ccccccccscccscccccccccccccccccccccccscc"
- style="fill:#df773f;fill-opacity:1;stroke-width:0.55274624"
- inkscape:connector-curvature="0"
- d="m 52.679499,35.067008 c -3.689428,6.012324 -6.881533,11.218372 -7.047487,11.56665 -0.366957,0.775384 -0.158869,1.256648 0.863255,2.055403 1.002036,0.756513 9.643605,4.615299 10.546292,4.683432 0.346753,0.032 0.835217,-0.117356 1.077926,-0.325992 0.501897,-0.404396 14.464121,-24.862916 14.712078,-25.757849 0.210826,-0.711518 -0.463445,-1.955394 -1.2682,-2.31875 -0.725926,-0.328305 -10.122594,-2.201467 -10.585294,-2.085086 -0.189097,0.0381 -0.613698,0.343578 -0.946586,0.667618 -0.332889,0.324039 -3.633192,5.498644 -7.351984,11.514574 z m 8.376926,-8.748631 c 0.754864,-0.286368 1.442143,0.0914 1.328701,0.746251 -0.150564,0.838271 -1.544893,1.501191 -2.138386,1.037394 -0.313232,-0.244783 -0.304379,-0.901711 -0.02454,-1.293768 0.103068,-0.131885 0.479735,-0.34205 0.834241,-0.489877 z m 1.992989,3.682537 c 1.294319,-0.26311 1.377062,1.262007 0.06562,1.750792 -0.725494,0.282765 -1.119628,0.10753 -1.211769,-0.522105 -0.06636,-0.662604 0.301561,-1.065471 1.14606,-1.228683 z m 1.765789,3.531536 c 0.416848,-0.125661 0.616751,-0.07566 0.816109,0.212907 0.545016,0.797667 -0.03528,1.778085 -1.112655,1.865526 -0.574501,0.05556 -0.732155,-0.01454 -0.896463,-0.381914 -0.248269,-0.565767 0.388691,-1.448798 1.193009,-1.696519 z m -10.65429,4.497903 c 2.509912,0.400097 -1.238185,3.740816 -1.311465,1.338407 0.0089,-0.656928 0.619492,-1.268431 1.311465,-1.338407 z m -2.931192,7.454582 c -0.581269,0.607902 -1.339192,0.626345 -1.695654,0.02915 -0.447742,-3.082292 3.36677,-1.882508 1.695654,-0.02915 z m 8.254404,-5.737587 c 1.077379,-0.08745 1.436895,0.777689 0.715432,1.700896 -2.149011,1.826887 -2.569766,-1.422834 -0.715432,-1.700896 z m -3.505457,5.810892 c 0.789365,-0.126643 1.066023,0.06301 1.159689,0.826599 0.154915,1.262873 -1.625363,2.181813 -2.384694,1.216669 -0.530602,-0.680191 0.200691,-1.887809 1.225005,-2.043268 z"
- id="objDomino_6-6_matblack_p0001-4" />
+ d="m -171.42159,257.82741 a 0.79396117,1.2427218 0 0 1 -0.89873,1.05243 0.79396117,1.2427218 0 0 1 -0.67305,-1.40593 0.79396117,1.2427218 0 0 1 0.89773,-1.05451 0.79396117,1.2427218 0 0 1 0.67438,1.40437"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="1.2427218"
+ sodipodi:rx="0.79396117"
+ sodipodi:cy="257.64975"
+ sodipodi:cx="-172.2074"
+ sodipodi:type="arc"
+ id="path4224-6"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1f2a38;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
- sodipodi:nodetypes="cssssscsssccscccsssscccsssssssscscssssssccccssssscscccsssssscccccssssccsccssscssscscccc"
- inkscape:connector-curvature="0"
- id="objDomino_6-6_matblack_p0001-0-5"
- d="m 60.846833,22.994702 c -0.171188,0.03539 -0.317502,0.131687 -0.498071,0.259833 -0.181771,0.128998 -0.377607,0.292209 -0.55255,0.462502 -0.08027,0.07813 -0.153726,0.183851 -0.284975,0.370789 -0.131249,0.18694 -0.302382,0.440354 -0.510148,0.753616 -0.415541,0.62652 -0.976284,1.492976 -1.642459,2.53668 -1.332341,2.087411 -3.087241,4.88552 -4.947096,7.894228 -1.844723,3.006181 -3.565257,5.811139 -4.845418,7.908077 -0.640078,1.048467 -1.170105,1.92006 -1.550764,2.551728 -0.190328,0.315835 -0.343694,0.571398 -0.454728,0.759949 -0.111034,0.18855 -0.173839,0.296797 -0.20735,0.367118 l -7.74e-4,8.85e-4 c -0.197487,0.41729 -0.252258,0.815551 -0.09274,1.19325 0.159523,0.377702 0.495658,0.713912 1.017592,1.121789 l 0.0018,0.0017 0.0018,7.74e-4 c 0.298719,0.225529 1.010432,0.592558 1.978718,1.063293 0.968298,0.470729 2.172157,1.026212 3.373222,1.560913 1.201067,0.534701 2.398674,1.048135 3.355166,1.432808 0.478241,0.192334 0.896364,0.352493 1.226175,0.467812 0.329459,0.115197 0.549235,0.187615 0.724767,0.200982 1.85e-4,1.5e-5 4.27e-4,-3.6e-5 8.29e-4,-3e-5 0.423778,0.03813 0.919101,-0.109103 1.230523,-0.375201 0.06767,-0.05528 0.07995,-0.08609 0.123386,-0.147491 0.04424,-0.06253 0.09901,-0.144554 0.164913,-0.246835 0.131818,-0.204559 0.308697,-0.48892 0.524391,-0.844438 0.431392,-0.711044 1.018788,-1.70373 1.710808,-2.886188 1.384041,-2.364913 3.184751,-5.488784 4.977182,-8.627802 1.792426,-3.139023 3.576428,-6.293502 4.928674,-8.71969 0.676123,-1.213098 1.244027,-2.244168 1.651427,-3.001083 0.203699,-0.37846 0.367501,-0.687996 0.484872,-0.919089 0.116953,-0.230263 0.181936,-0.350697 0.215289,-0.47026 0.131913,-0.447536 -0.01089,-0.97346 -0.271195,-1.450887 -0.260678,-0.478027 -0.64925,-0.911501 -1.114647,-1.12163 -0.134883,-0.061 -0.34903,-0.117725 -0.679613,-0.200957 -0.330583,-0.08324 -0.76028,-0.18337 -1.256606,-0.293617 -0.992655,-0.220494 -2.251568,-0.482438 -3.501764,-0.730091 -1.250198,-0.247652 -2.491593,-0.480911 -3.451861,-0.645786 -0.480134,-0.08244 -0.889518,-0.14743 -1.196759,-0.188771 -0.153618,-0.02067 -0.281723,-0.03579 -0.382887,-0.04372 -0.09852,-0.0077 -0.150917,-0.01846 -0.248998,0.0049 z m 0.09794,0.415345 c -0.04552,0.01145 0.03047,-2.83e-4 0.118139,0.0066 0.08767,0.0069 0.209499,0.02038 0.358518,0.04043 0.298043,0.0401 0.704422,0.104879 1.181635,0.186815 0.954425,0.163871 2.194229,0.397353 3.441781,0.64448 1.24755,0.24713 2.502941,0.507723 3.490784,0.727145 0.493925,0.109713 0.921578,0.209083 1.245632,0.290674 0.32405,0.08159 0.561869,0.154887 0.608464,0.175963 0.339358,0.153221 0.689667,0.523896 0.914671,0.936565 0.225003,0.412675 0.314077,0.863263 0.235961,1.126907 l 6.3e-5,0.0017 -7.74e-4,0.0018 c 0.0023,-0.0081 -0.07086,0.167378 -0.185498,0.393079 -0.114635,0.225705 -0.276574,0.532922 -0.479367,0.909691 -0.40558,0.753535 -0.973555,1.78392 -1.649104,2.995981 -1.351094,2.424118 -3.134458,5.577395 -4.926322,8.715422 -1.791858,3.13803 -3.592045,6.260776 -4.974824,8.623541 -0.691391,1.181377 -1.278479,2.172781 -1.707683,2.880218 -0.214599,0.353714 -0.390078,0.636422 -0.518047,0.83501 -0.06453,0.101117 -0.134661,0.198548 -0.202354,0.297573 -0.321881,0.31618 -0.547982,0.360086 -0.92137,0.277851 l -0.0017,6.2e-5 0.09129,0.01234 c -0.05005,-0.0038 -0.39042,-0.07959 -0.709893,-0.19129 -0.319471,-0.111705 -0.732194,-0.270169 -1.20669,-0.461001 C 54.199084,52.455908 53.00394,51.944028 51.806523,51.410949 50.609106,50.877874 49.408941,50.323918 48.446906,49.85623 47.485194,49.388698 46.74177,48.98918 46.539175,48.836335 l -8.29e-4,3e-5 c -0.497625,-0.389345 -0.776177,-0.693617 -0.884199,-0.949383 -0.108213,-0.256218 -0.08358,-0.485976 0.08544,-0.843467 l -3.1e-5,-8.29e-4 c 0.0082,-0.01712 0.08069,-0.147088 0.190198,-0.333049 0.109712,-0.186301 0.262427,-0.441365 0.452345,-0.756513 0.379835,-0.630303 0.909315,-1.501046 1.549183,-2.549166 1.279644,-2.096084 3.0001,-4.900488 4.844645,-7.906376 1.858937,-3.007227 3.613211,-5.804212 4.94394,-7.889095 0.665364,-1.042442 1.224585,-1.906971 1.637691,-2.529819 0.206554,-0.311427 0.376321,-0.562615 0.503802,-0.744185 0.12748,-0.18157 0.230683,-0.308347 0.233639,-0.311221 0.157946,-0.153746 0.340406,-0.305388 0.501433,-0.419664 0.161023,-0.114275 0.321928,-0.187979 0.338355,-0.19129 l 0.005,-9.95e-4 0.005,-9.95e-4 z"
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#94441a;fill-opacity:1;fill-rule:nonzero;stroke:#94441a;stroke-width:0.42783314;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ d="m -172.2233,258.40469 a 0.55232084,0.6213609 0 0 1 -0.6252,0.52621 0.55232084,0.6213609 0 0 1 -0.46821,-0.70296 0.55232084,0.6213609 0 0 1 0.62451,-0.52726 0.55232084,0.6213609 0 0 1 0.46914,0.70218"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="0.6213609"
+ sodipodi:rx="0.55232084"
+ sodipodi:cy="258.31586"
+ sodipodi:cx="-172.76994"
+ sodipodi:type="arc"
+ id="path4241-1"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
- sodipodi:nodetypes="ccccccc"
- inkscape:connector-curvature="0"
- id="path4964-7"
- d="m 54.162878,34.722723 c 1.251582,0.05525 3.986082,1.017229 4.53286,1.298527 2.181054,1.073456 5.10109,1.844176 6.899006,2.793226 -0.08313,0.364692 -0.05785,0.243839 -0.303594,0.353702 -0.649402,-0.214416 -3.948298,-1.41482 -4.573303,-1.68553 -2.178817,-0.755427 -4.506409,-1.662448 -6.765813,-2.324381 -0.141945,-0.07016 0.07247,-0.29266 0.210844,-0.435544 z"
- style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#94441a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.31647754;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ d="m -172.60049,259.90966 a 0.25940847,0.32844853 0 0 1 -0.29364,0.27815 0.25940847,0.32844853 0 0 1 -0.21991,-0.37158 0.25940847,0.32844853 0 0 1 0.29332,-0.27871 0.25940847,0.32844853 0 0 1 0.22033,0.37117"
+ sodipodi:open="true"
+ sodipodi:end="0.14048923"
+ sodipodi:start="0.14344896"
+ sodipodi:ry="0.32844853"
+ sodipodi:rx="0.25940847"
+ sodipodi:cy="259.8627"
+ sodipodi:cx="-172.85724"
+ sodipodi:type="arc"
+ id="path4241-3-8"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.44660908;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
</g>
</g>
</svg>
diff --git a/src/activities/roman_numerals/RomanNumerals.qml b/src/activities/roman_numerals/RomanNumerals.qml
index 0470096b7..49c42112f 100644
--- a/src/activities/roman_numerals/RomanNumerals.qml
+++ b/src/activities/roman_numerals/RomanNumerals.qml
@@ -1,530 +1,530 @@
/* GCompris - roman_numerals.qml
*
* Copyright (C) 2016 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
pageComponent: Image {
id: background
source: items.toArabic ?
"qrc:/gcompris/src/activities/roman_numerals/resource/arcs.svg" :
"qrc:/gcompris/src/activities/roman_numerals/resource/torrazzo-crema.svg"
fillMode: Image.PreserveAspectCrop
sourceSize.width: Math.max(parent.width, parent.height)
signal start
signal stop
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias score: score
property alias textInput: textInput
property bool toArabic: dataset[currentLevel].toArabic
property string questionText: dataset[currentLevel].question
property string instruction: dataset[currentLevel].instruction
property string questionValue
property int currentLevel: 0
property int numberOfLevel: dataset.length
property var dataset: [
{
values: ['I', 'V', 'X', 'L', 'C', 'D', 'M'],
instruction: qsTr("The roman numbers are all built out of these 7 numbers:\nI and V (units, 1 and 5)\nX and L (tens, 10 and 50)\nC and D (hundreds, 100 and 500)\n and M (1000).\n An interesting observation here is that the roman numeric system lacks the number 0."),
question: qsTr("Convert the roman number %1 in arabic."),
toArabic: true
},
{
values: [1, 5, 10, 50, 100, 500, 1000],
instruction: qsTr("The roman numbers are all built out of these 7 numbers:\nI and V (units, 1 and 5)\nX and L (tens, 10 and 50)\nC and D (hundreds, 100 and 500)\n and M (1000).\n An interesting observation here is that the roman numeric system lacks the number 0."),
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX'],
instruction: qsTr("All the units except 4 and 9 are built using sums of I and V:\nI, II, III, V, VI, VII, VIII.\n The 4 and the 9 units are built using differences:\nIV (5 – 1) and IX (10 – 1)"),
question: qsTr("Convert the roman number %1 in arabic."),
toArabic: true
},
{
values: [2, 3, 4, 5, 6, 7, 8, 9],
instruction: qsTr("All the units except 4 and 9 are built using sums of I and V:\nI, II, III, V, VI, VII, VIII.\n The 4 and the 9 units are built using differences:\nIV (5 – 1) and IX (10 – 1)"),
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['XX', 'XXX', 'XL', 'LX', 'LXX', 'LXXX', 'XC'],
instruction: qsTr("All the tens except 40 and 90 are built using sums of X and L:\nX, XX, XXX, L, LX, LXX, LXXX.\nThe 40 and the 90 tens are built using differences:\nXL (10 taken from 50) and XC (10 taken from 100)\n "),
question: qsTr("Convert the roman number %1 in arabic."),
toArabic: true
},
{
values: [20, 30, 40, 60, 70, 80, 90],
instruction: qsTr("All the tens except 40 and 90 are built using sums of X and L:\nX, XX, XXX, L, LX, LXX, LXXX.\nThe 40 and the 90 tens are built using differences:\nXL (10 taken from 50) and XC (10 taken from 100)\n "),
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['CC', 'CCC', 'CD', 'DC', 'DCC', 'DCCC', 'CM', ],
instruction: qsTr("All the hundreds except 400 and 900 are built using sums of C and D:\nC, CC, CCC, D, DC, DCC, DCCC.\nThe 400 and the 900 hundreds are built using differences:\nCD (100 taken from 500) and CM (100 taken from 1000)"),
question: qsTr("Convert the roman number %1 in arabic."),
toArabic: true
},
{
values: [200, 300, 400, 600, 700, 800, 900],
instruction: qsTr("All the hundreds except 400 and 900 are built using sums of C and D:\nC, CC, CCC, D, DC, DCC, DCCC.\nThe 400 and the 900 hundreds are built using differences:\nCD (100 taken from 500) and CM (100 taken from 1000)"),
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['MM', 'MMM'],
instruction: qsTr("Sums of M are used for building thousands: M, MM, MMM.\nNotice that you cannot join more than three identical symbols. The first implication of this rule is that you cannot use just sums for building all possible units, tens or hundreds, you must use differences too. On the other hand, it limits the maximum roman number to 3999 (MMMCMXCIX).\n"),
question: qsTr("Convert the roman number %1 in arabic."),
toArabic: true
},
{
values: [2000, 3000],
instruction: qsTr("Sums of M are used for building thousands: M, MM, MMM.\nNotice that you cannot join more than three identical symbols. The first implication of this rule is that you cannot use just sums for building all possible units, tens or hundreds, you must use differences too. On the other hand, it limits the maximum roman number to 3999 (MMMCMXCIX).\n"),
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['_random_', 50 /* up to this number */ , 10 /* sublevels */],
instruction: qsTr("Now you know the rules, you can read and write numbers in roman numerals."),
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['_random_', 100, 10],
instruction: '',
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['_random_', 500, 10],
instruction: '',
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
},
{
values: ['_random_', 1000, 10],
instruction: '',
question: qsTr("Convert the arabic number %1 in roman."),
toArabic: false
}
]
onQuestionValueChanged: {
textInput.text = ''
romanConverter.arabic = 0
if(toArabic)
keyboard.populateArabic()
else
keyboard.populateRoman()
}
function start() {
if (!ApplicationInfo.isMobile)
textInput.forceActiveFocus();
items.currentLevel = 0
initLevel()
}
function initLevel() {
score.currentSubLevel = 1
initSubLevel()
}
function initSubLevel() {
if(dataset[currentLevel].values[0] === '_random_') {
questionValue = Math.round(Math.random() * dataset[currentLevel].values[1] + 1)
score.numberOfSubLevels = dataset[currentLevel].values[2]
} else {
questionValue = dataset[currentLevel].values[score.currentSubLevel - 1]
score.numberOfSubLevels = dataset[currentLevel].values.length
}
}
function nextLevel() {
if(numberOfLevel - 1 == currentLevel ) {
currentLevel = 0
} else {
currentLevel++
}
initLevel();
}
function previousLevel() {
if(currentLevel == 0) {
currentLevel = numberOfLevel - 1
} else {
currentLevel--
}
initLevel();
}
function nextSubLevel() {
if(++score.currentSubLevel > score.numberOfSubLevels) {
nextLevel()
} else {
initSubLevel();
}
}
property bool isChecking: false
function check() {
if(isChecking) {
return
}
isChecking = true
if(feedback.value == items.questionValue) {
bonus.good('tux')
} else {
- bonus.bad('tux')
+ bonus.bad('tux', bonus.checkAnswer)
}
}
}
onStart: {
items.start()
}
onStop: { }
Keys.onPressed: {
if ((event.key === Qt.Key_Enter) || (event.key === Qt.Key_Return)) {
items.check()
}
}
QtObject {
id: romanConverter
property int arabic
property string roman
// conversion code copied from:
// http://blog.stevenlevithan.com/archives/javascript-roman-numeral-converter
function arabic2Roman(num) {
if (!+num)
return '';
var digits = String(+num).split(""),
key = ["","C","CC","CCC","CD","D","DC","DCC","DCCC","CM",
"","X","XX","XXX","XL","L","LX","LXX","LXXX","XC",
"","I","II","III","IV","V","VI","VII","VIII","IX"],
roman = "",
i = 3;
while (i--)
roman = (key[+digits.pop() + (i * 10)] || "") + roman;
return new Array(+digits.join("") + 1).join("M") + roman;
}
function roman2Arabic(str) {
var str = str.toUpperCase(),
validator = /^M*(?:D?C{0,3}|C[MD])(?:L?X{0,3}|X[CL])(?:V?I{0,3}|I[XV])$/,
token = /[MDLV]|C[MD]?|X[CL]?|I[XV]?/g,
key = {M:1000,CM:900,D:500,CD:400,C:100,XC:90,L:50,XL:40,X:10,IX:9,V:5,IV:4,I:1},
num = 0, m;
if (!(str && validator.test(str)))
return false;
while (m = token.exec(str))
num += key[m[0]];
return num;
}
onArabicChanged: roman = arabic2Roman(arabic)
onRomanChanged: arabic = roman2Arabic(roman)
}
Column {
id: column
anchors.fill: parent
anchors.topMargin: 10
GCText {
id: questionLabel
anchors.horizontalCenter: parent.horizontalCenter
wrapMode: TextEdit.WordWrap
text: items.questionValue ? items.questionText.arg(items.questionValue) : ''
color: 'white'
width: parent.width * 0.9
horizontalAlignment: Text.AlignHCenter
Rectangle {
z: -1
border.color: 'black'
border.width: 1
anchors.centerIn: parent
width: parent.width * 1.1
height: parent.height
opacity: 0.8
gradient: Gradient {
GradientStop { position: 0.0; color: "#000" }
GradientStop { position: 0.9; color: "#666" }
GradientStop { position: 1.0; color: "#AAA" }
}
radius: 10
}
}
Item { // Just a margin
width: 1
height: 5 * ApplicationInfo.ratio
}
TextInput {
id: textInput
x: parent.width / 2
width: 60 * ApplicationInfo.ratio
color: 'white'
text: ''
maximumLength: items.toArabic ?
('' + romanConverter.roman2Arabic(items.questionValue)).length + 1 :
romanConverter.arabic2Roman(items.questionValue).length + 1
horizontalAlignment: Text.AlignHCenter
verticalAlignment: TextInput.AlignVCenter
anchors.horizontalCenter: parent.horizontalCenter
font.pointSize: questionLabel.pointSize
font.weight: Font.DemiBold
font.family: GCSingletonFontLoader.fontLoader.name
font.capitalization: ApplicationSettings.fontCapitalization
font.letterSpacing: ApplicationSettings.fontLetterSpacing
cursorVisible: true
validator: RegExpValidator{regExp: items.toArabic ?
/[0-9]+/ :
/[ivxlcdmIVXLCDM]*/}
onTextChanged: if(text) {
text = text.toUpperCase();
if(items.toArabic)
romanConverter.arabic = parseInt(text)
else
romanConverter.roman = text
}
Rectangle {
z: -1
opacity: 0.8
gradient: Gradient {
GradientStop { position: 0.0; color: "#000" }
GradientStop { position: 0.9; color: "#666" }
GradientStop { position: 1.0; color: "#AAA" }
}
radius: 10
border.color: 'black'
border.width: 1
anchors.horizontalCenter: parent.horizontalCenter
width: column.width * 0.7
height: parent.height
}
function appendText(car) {
if(car === keyboard.backspace) {
if(text && cursorPosition > 0) {
var oldPos = cursorPosition
text = text.substring(0, cursorPosition - 1) + text.substring(cursorPosition)
cursorPosition = oldPos - 1
}
return
}
var oldPos = cursorPosition
text = text.substring(0, cursorPosition) + car + text.substring(cursorPosition)
cursorPosition = oldPos + 1
}
}
Item { // Just a margin
width: 1
height: 5 * ApplicationInfo.ratio
}
GCText {
id: feedback
anchors.horizontalCenter: parent.horizontalCenter
text: items.toArabic ?
qsTr("Roman value: %1").arg(value) :
qsTr('Arabic value: %1').arg(value)
color: 'white'
Rectangle {
z: -1
opacity: 0.8
gradient: Gradient {
GradientStop { position: 0.0; color: "#000" }
GradientStop { position: 0.9; color: "#666" }
GradientStop { position: 1.0; color: "#AAA" }
}
radius: 10
border.color: 'black'
border.width: 1
anchors.centerIn: parent
width: parent.width * 1.1
height: parent.height
}
property string value: items.toArabic ?
romanConverter.roman :
romanConverter.arabic ? romanConverter.arabic : ''
}
Item { // Just a margin
width: 1
height: 5 * ApplicationInfo.ratio
}
Rectangle {
color: "transparent"
width: parent.width
height: (background.height - (y + bar.height + okButton.height + keyboard.height) * 1.1 )
Flickable {
width: parent.width
height: parent.height
contentWidth: parent.width
contentHeight: instructionContainer.height
anchors.fill: parent
flickableDirection: Flickable.VerticalFlick
clip: true
GCText {
id: instruction
visible: items.instruction != ''
wrapMode: TextEdit.WordWrap
fontSize: tinySize
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width * 0.95
text: items.instruction
horizontalAlignment: Text.AlignHCenter
color: 'white'
Rectangle {
id: instructionContainer
z: -1
opacity: 0.8
gradient: Gradient {
GradientStop { position: 0.0; color: "#000" }
GradientStop { position: 0.9; color: "#666" }
GradientStop { position: 1.0; color: "#AAA" }
}
radius: 10
border.color: 'black'
border.width: 1
anchors.centerIn: parent
width: parent.width
height: parent.contentHeight
}
}
}
}
}
Score {
id: score
anchors.bottom: bar.top
currentSubLevel: 0
numberOfSubLevels: 1
}
DialogHelp {
id: dialogHelp
onClose: home()
}
VirtualKeyboard {
id: keyboard
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
function populateArabic() {
layout = [ [
{ label: "0" },
{ label: "1" },
{ label: "2" },
{ label: "3" },
{ label: "4" },
{ label: "5" },
{ label: "6" },
{ label: "7" },
{ label: "8" },
{ label: "9" },
{ label: keyboard.backspace }
] ]
}
function populateRoman() {
layout = [ [
{ label: "I" },
{ label: "V" },
{ label: "X" },
{ label: "L" },
{ label: "C" },
{ label: "D" },
{ label: "M" },
{ label: keyboard.backspace }
] ]
}
onKeypress: textInput.appendText(text)
onError: console.log("VirtualKeyboard error: " + msg);
}
Bar {
id: bar
anchors.bottom: keyboard.top
content: BarEnumContent { value: help | home | level | hint }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: items.previousLevel()
onNextLevelClicked: items.nextLevel()
onHomeClicked: activity.home()
level: items.currentLevel + 1
onHintClicked: feedback.visible = !feedback.visible
}
BarButton {
id: okButton
source: "qrc:/gcompris/src/core/resource/bar_ok.svg";
sourceSize.width: 60 * ApplicationInfo.ratio
visible: true
anchors {
verticalCenter: score.verticalCenter
right: score.left
rightMargin: 10 * ApplicationInfo.ratio
bottomMargin: 10 * ApplicationInfo.ratio
}
onClicked: items.check()
}
Bonus {
id: bonus
Component.onCompleted: win.connect(items.nextSubLevel)
onWin: items.isChecking = false
onLoose: items.isChecking = false
}
}
}
diff --git a/src/activities/share/Share.qml b/src/activities/share/Share.qml
index a6b40af7e..ccce35d09 100644
--- a/src/activities/share/Share.qml
+++ b/src/activities/share/Share.qml
@@ -1,442 +1,442 @@
/* GCompris - Share.qml
*
* Copyright (C) 2016 Stefan Toncu <stefan.toncu29@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "share.js" as Activity
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
pageComponent: Rectangle {
id: background
anchors.fill: parent
color: "#abcdef"
signal start
signal stop
Component.onCompleted: {
dialogActivityConfig.getInitialConfiguration()
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias instruction: instruction
property int currentSubLevel: 0
property int nbSubLevel
property alias listModel: listModel
property bool acceptCandy: false
property alias dataset: dataset
property alias girlWidget: girlWidget
property alias boyWidget: boyWidget
property alias candyWidget: candyWidget
property alias basketWidget: basketWidget
property alias leftWidget: leftWidget
property int totalBoys
property int totalGirls
property int totalCandies
property int totalChildren: totalBoys + totalGirls
property int barHeightAddon: ApplicationSettings.isBarHidden ? 1 : 3
property int cellSize: Math.round(Math.min(background.width / 12, background.height / (11 + barHeightAddon)))
property alias repeaterDropAreas: repeaterDropAreas
property int maxNumberOfCandiesPerWidget: 8
}
Loader {
id: dataset
asynchronous: false
}
onStart: { Activity.start(items) }
onStop: { Activity.stop() }
property bool vert: background.width >= background.height
property int currentBoys: 0
property int currentGirls: 0
property int currentCandies: 0
property int rest
property int placedInGirls
property int placedInBoys
property bool showCount: true
property bool easyMode: true
property alias wrongMove: wrongMove
property bool finished: false
//returns true if the x and y is in the "dest" area
function contains(x, y, dest) {
return (x > dest.x && x < dest.x + dest.width &&
y > dest.y && y < dest.y + dest.height)
}
//stop the candy rotation
function resetCandy() {
items.acceptCandy = false;
candyWidget.element.rotation = 0
}
//check if the answer is correct
function check() {
background.resetCandy()
background.finished = true
var ok = 0
var okRest = 0
if (listModel.count >= items.totalChildren) {
for (var i = 0 ; i < listModel.count ; i++) {
if (listModel.get(i).nameS === "basket")
okRest = listModel.get(i).countS
else if (listModel.get(i).countS === Math.floor(items.totalCandies/items.totalChildren))
ok ++
}
//condition without rest
if (rest == 0 && ok == items.totalChildren) {
bonus.good("flower")
return
}
//condition with rest
else if (rest == okRest && ok == items.totalChildren) {
bonus.good("tux")
return
}
}
//else => bad
- bonus.bad("flower")
+ bonus.bad("flower", bonus.checkAnswer)
}
//center zone
Rectangle {
id: grid
z: 4
//map the coordinates from widgets to grid
property var boy: leftWidget.mapFromItem(boyWidget, boyWidget.element.x, boyWidget.element.y)
property var girl: leftWidget.mapFromItem(girlWidget, girlWidget.element.x, girlWidget.element.y)
property var basket: leftWidget.mapFromItem(basketWidget, basketWidget.element.x, basketWidget.element.y)
//show that the widget can be dropped here
color: background.contains(boy.x, boy.y, grid) ||
background.contains(girl.x, girl.y, grid) ||
background.contains(basket.x, basket.y, grid) ? "#d5e6f7" : "transparent"
anchors {
top: background.vert ? parent.top : leftWidget.bottom
left: background.vert ? leftWidget.right : parent.left
topMargin: 20
leftMargin: 20
}
width: background.vert ?
background.width - leftWidget.width - 40 : background.width - 40
height: ApplicationSettings.isBarHidden ?
background.height : background.vert ?
background.height - (bar.height * 1.1) :
background.height - (bar.height * 1.1) - leftWidget.height
//shows/hides the Instruction
MouseArea {
anchors.fill: parent
// first hide the wrong move if visible, then show/hide instruction
onClicked: wrongMove.visible ? wrongMove.visible = false :
(instruction.opacity === 0) ?
instruction.show() : instruction.hide()
}
ListModel {
id: listModel
}
Flow {
id: dropAreas
spacing: 10
width: parent.width
height: parent.height
Repeater {
id: repeaterDropAreas
model: listModel
DropChild {
id: rect2
//"nameS" from listModel
name: nameS
}
}
}
}
//instruction rectangle
Rectangle {
id: instruction
anchors.fill: instructionTxt
opacity: 0.8
radius: 10
border.width: 2
z: 10
border.color: "#DDD"
color: "#373737"
property alias text: instructionTxt.text
Behavior on opacity { PropertyAnimation { duration: 200 } }
//shows/hides the Instruction
MouseArea {
anchors.fill: parent
onClicked: instruction.hide()
enabled: instruction.opacity !== 0
}
function show() {
if(text)
opacity = 1
}
function hide() {
opacity = 0
}
}
//instruction for playing the game
GCText {
id: instructionTxt
anchors {
top: background.vert ? parent.top : leftWidget.bottom
- topMargin: -10
+ topMargin: 10
horizontalCenter: grid.horizontalCenter
}
opacity: instruction.opacity
z: instruction.z
fontSize: background.vert ? regularSize : smallSize
color: "white"
horizontalAlignment: Text.AlignHCenter
width: Math.max(Math.min(parent.width * 0.8, text.length * 8), parent.width * 0.3)
wrapMode: TextEdit.WordWrap
}
//left widget, with girl/boy/candy/basket widgets in a grid
Rectangle {
id: leftWidget
width: background.vert ?
items.cellSize * 1.74 : background.width
height: background.vert ?
background.height : items.cellSize * 1.74
color: "#5a9de0"
border.color: "#3f81c4"
border.width: 4
z: 4
//grid with ok button and images of a boy, a girl, a candy, a basket and the button to display the instructions
Grid {
id: view
x: 10
y: 10
width: background.vert ? leftWidget.width : 3 * bar.height
height: background.vert ? background.height - 2 * bar.height : bar.height
spacing: 10
columns: background.vert ? 1 : 6
//ok button
Image {
id: okButton
source:"qrc:/gcompris/src/core/resource/bar_ok.svg"
sourceSize.width: items.cellSize * 1.5 - view.x / 2
fillMode: Image.PreserveAspectFit
MouseArea {
id: mouseArea
anchors.fill: parent
enabled: background.finished ? false : true
onPressed: okButton.opacity = 0.6
onReleased: okButton.opacity = 1
onClicked: background.check()
}
}
ChildWidget {
id: girlWidget
name: "girl"
total: items.totalGirls
current: background.currentGirls
placedInChild: background.placedInGirls
}
ChildWidget {
id: boyWidget
name: "boy"
total: items.totalBoys
current: background.currentBoys
placedInChild: background.placedInBoys
}
BasketWidget {
id: basketWidget
}
CandyWidget {
id: candyWidget
total: background.easyMode ? items.totalCandies : 8 * items.totalChildren + 1
current: background.currentCandies
element.opacity: background.easyMode ? 1 : 0
}
Image {
id: showInstruction
source:"qrc:/gcompris/src/core/resource/bar_hint.svg"
sourceSize.width: items.cellSize * 1.5 - view.x / 2
fillMode: Image.PreserveAspectFit
MouseArea {
anchors.fill: parent
enabled: background.finished ? false : true
onPressed: showInstruction.opacity = 0.6
onReleased: showInstruction.opacity = 1
onClicked: items.instruction.opacity == 0 ? items.instruction.show() : items.instruction.hide()
}
}
}
}
// show message warning for placing too many candies in one area
Rectangle {
id: wrongMove
z: 5
color: "orange"
radius: width / height * 10
visible: false
width: grid.width
height: grid.height / 3
anchors.centerIn: grid
MouseArea {
anchors.fill: parent
onClicked: parent.visible = false
}
GCText {
id: wrongMoveText
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
width: parent.width - 2 // -2 for margin
height: parent.height
fontSizeMode: Text.Fit
wrapMode: Text.WordWrap
color: "#404040"
text: qsTr("You can't put more than %1 pieces of candy in the same rectangle").arg(items.maxNumberOfCandiesPerWidget)
}
}
DialogActivityConfig {
id: dialogActivityConfig
currentActivity: activity
content: Component {
Item {
height: column.height
Column {
id: column
spacing: 10
width: parent.width
GCDialogCheckBox {
id: easyModeBox
width: dialogActivityConfig.width
text: qsTr("Display candy counter")
checked: background.easyMode
onCheckedChanged: {
background.easyMode = checked
Activity.reloadRandom()
}
}
}
}
}
onLoadData: {
if(dataToSave && dataToSave["mode"]) {
background.easyMode = (dataToSave["mode"] === "true");
}
}
onSaveData: {
dataToSave = { "mode": "" + background.easyMode }
}
onClose: home()
}
//bar buttons
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level | reload | config}
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
onReloadClicked: Activity.reloadRandom()
onConfigClicked: {
dialogActivityConfig.active = true
displayDialog(dialogActivityConfig)
}
}
Bonus {
id: bonus
Component.onCompleted: {
win.connect(Activity.nextSubLevel)
}
onStop: background.finished = false
}
Score {
anchors {
left: undefined
right: leftWidget.right
bottom: background.vert ? bar.top : leftWidget.bottom
margins: 3 * ApplicationInfo.ratio
}
width: girlWidget.width
height: background.vert ? (girlWidget.height * 0.8) : girlWidget.height
numberOfSubLevels: items.nbSubLevel
currentSubLevel: items.currentSubLevel + 1
}
}
}
diff --git a/src/activities/smallnumbers/Smallnumbers.qml b/src/activities/smallnumbers/Smallnumbers.qml
index 6cc3bcde9..c685b6697 100644
--- a/src/activities/smallnumbers/Smallnumbers.qml
+++ b/src/activities/smallnumbers/Smallnumbers.qml
@@ -1,38 +1,38 @@
/* GCompris - smallnumbers.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "../gletters"
Gletters {
id: activity
mode: "letter"
+ activityName: "smallnumbers"
dataSetUrl: "qrc:/gcompris/src/activities/smallnumbers/resource/"
- configurationButtonVisible: false
function getImage(key) {
return dataSetUrl + "dice" + key + ".svg"
}
}
diff --git a/src/activities/smallnumbers2/ActivityConfig.qml b/src/activities/smallnumbers2/ActivityConfig.qml
index 0d980e6bc..e7d1eb424 100644
--- a/src/activities/smallnumbers2/ActivityConfig.qml
+++ b/src/activities/smallnumbers2/ActivityConfig.qml
@@ -1,60 +1,91 @@
/* GCompris - ActivityConfig.qml
*
* Copyright (C) 2019 Akshay Kumar <email.akshay98@gmail.com>
*
* Authors:
* Akshay Kumar <email.akshay98@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
+import GCompris 1.0
import "../../core"
Item {
id: activityConfiguration
property Item background
property alias modeBox: modeBox
property var availableModes: [
{ "text": qsTr("Dots"), "value": "dot" },
{ "text": qsTr("Arabic numbers"), "value": "number" },
{ "text": qsTr("Roman numbers"), "value": "roman" },
{ "text": qsTr("Images"), "value": "image" }
]
+ property alias speedSlider: speedSlider
+ property int speedSetting: 10
+
Flow {
id: flow
spacing: 5
width: parent.width
GCComboBox {
id: modeBox
model: availableModes
background: activityConfiguration.background
label: qsTr("Select Domino Representation")
}
+ GCText {
+ id: speedSliderText
+ text: qsTr("Speed")
+ fontSize: mediumSize
+ wrapMode: Text.WordWrap
+ height: 100
+ }
+ Flow {
+ width: dialogActivityConfig.width
+ spacing: 5
+ GCSlider {
+ id: speedSlider
+ width: 250 * ApplicationInfo.ratio
+ value: speedSetting
+ maximumValue: 10
+ minimumValue: 1
+ scrollEnabled: false
+ }
+ }
}
property var dataToSave
function setDefaultValues() {
for(var i = 0 ; i < availableModes.length ; i++) {
if(availableModes[i].value === dataToSave["mode"]) {
modeBox.currentIndex = i;
break;
}
}
+ if(dataToSave.speedSetting) {
+ activityConfiguration.speedSetting = dataToSave.speedSetting
+ }
+ else {
+ activityConfiguration.speedSetting = 10
+ }
}
function saveValues() {
var newMode = availableModes[modeBox.currentIndex].value;
- dataToSave = {"mode": newMode};
+ var oldSpeed = activityConfiguration.speedSetting
+ speedSetting = speedSlider.value
+ dataToSave = {"mode": newMode, "speedSetting": speedSetting}
}
}
diff --git a/src/activities/smallnumbers2/Smallnumbers2.qml b/src/activities/smallnumbers2/Smallnumbers2.qml
index 849e267c8..7915016b7 100644
--- a/src/activities/smallnumbers2/Smallnumbers2.qml
+++ b/src/activities/smallnumbers2/Smallnumbers2.qml
@@ -1,43 +1,42 @@
/* GCompris - smallnumbers2.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "../gletters"
Gletters {
id: activity
dataSetUrl: "qrc:/gcompris/src/activities/smallnumbers2/resource/"
- configurationButtonVisible: true
activityName: "smallnumbers2"
property string dominoMode: "dot"
function getMode() {
return activity.dominoMode;
}
function getDominoValues(key) {
var val1 = Math.floor(Math.random() * key)
return [val1, key - val1]
}
}
diff --git a/src/activities/solar_system/ActivityInfo.qml b/src/activities/solar_system/ActivityInfo.qml
index b8458c6ac..a6a7e2d4f 100644
--- a/src/activities/solar_system/ActivityInfo.qml
+++ b/src/activities/solar_system/ActivityInfo.qml
@@ -1,43 +1,43 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "solar_system/SolarSystem.qml"
difficulty: 5
icon: "solar_system/solar_system.svg"
author: "Aman Kumar Gupta &lt;gupta2140@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Solar System")
//: Help title
description: qsTr("Answer the questions with a correctness of 100%.")
//intro: "Answer the questions presented and get a 100% correctness among the options."
//: Help goal
- goal: qsTr("Learn information about the solar system. If you want to learn more about astronomy, try downloading KStars (https://edu.kde.org/kstars/) or Stellarium (http://stellarium.org/) which are open source astronomy softwares.")
+ goal: qsTr("Learn information about the solar system. If you want to learn more about astronomy, try downloading KStars (https://edu.kde.org/kstars/) or Stellarium (https://stellarium.org/) which are open source astronomy softwares.")
//: Help prerequisite
prerequisite: ""
//: Help manual
manual: qsTr("Click on a planet or the Sun to reveal questions. Each question contains 4 options. One of those is 100% correct. Try to answer the questions until you get a 100% closeness in the closeness meter.")
credit: ""
section: "sciences experiment"
createdInVersion: 9500
}
diff --git a/src/activities/solar_system/Dataset.js b/src/activities/solar_system/Dataset.js
index 4941db615..be7e518c5 100644
--- a/src/activities/solar_system/Dataset.js
+++ b/src/activities/solar_system/Dataset.js
@@ -1,383 +1,383 @@
/* GCompris - Dataset.js
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
function get() {
return [
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/sun.png",
"bodyName": qsTr("Sun"),
"bodySize": 1.3,
"levels": [
{ // sub-level 1
"question": qsTr("How large is the Sun compared to the planets in our Solar System?"),
"options": [qsTr("Sixth largest"), qsTr("Third largest"), qsTr("Largest"), qsTr("Seventh largest")],
"closeness": [17.5, 67, 100, 1]
},
{ // sub-level 2
"question": qsTr("The temperature of the Sun is around:"),
"options": [qsTr("1000 °C"), qsTr("4500 °C"), qsTr("5505 °C"), qsTr("3638 °C")],
"closeness": [1, 78, 100, 60]
},
{ // sub-level 3
"question": qsTr("How old is the Sun?"),
"options": [qsTr("1.2 billion years"), qsTr("3 billion years"), qsTr("7 billion years"), qsTr("4.5 billion years")],
"closeness": [1, 55, 25, 100]
},
{ // sub-level 4
"question": qsTr("How long does it take for the Sun’s light to reach the Earth?"),
"options": [qsTr("8 minutes"), qsTr("30 minutes"), qsTr("60 minutes"), qsTr("15 minutes")],
"closeness": [100, 58, 1, 86.6]
},
{ // sub-level 5
"question": qsTr("The Sun is as big as:"),
"options": [qsTr("1 million Earths"), qsTr("2.6 million Earths"), qsTr("1.3 million Earths"), qsTr("5 million Earths")],
"closeness": [92, 65, 100, 1]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/mercury.png",
"bodyName": qsTr("Mercury"),
"bodySize": 0.12,
"temperatureHint": qsTr("The maximum temperature on Earth is 58 °C."),
"lengthOfYearHint": qsTr("The length of a year on Venus is 225 days."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Mercury in the Solar System?"),
"options": [qsTr("Seventh"), qsTr("Sixth"), qsTr("First"), qsTr("Fourth")],
"closeness": [1, 17.5, 100, 50.5]
},
{ // sub-level 2
"question": qsTr("How small is Mercury compared to other planets in our Solar System?"),
"options": [qsTr("Smallest"), qsTr("Second smallest"), qsTr("Third smallest"), qsTr("Fifth smallest")],
"closeness": [100, 75.3, 50.5, 1]
},
{ // sub-level 3
"question": qsTr("How many moons has Mercury?"),
"options": ["5", "200", "0", "10"],
"closeness": [97.5, 1, 100, 95]
},
{ // sub-level 4
"question": qsTr("The maximum temperature on Mercury is:"),
"options": [qsTr("50 °C"), qsTr("35 °C"), qsTr("427 °C"), qsTr("273 °C")],
"closeness": [4.8, 1, 100, 61]
},
{ // sub-level 5
"question": qsTr("How many days make a year on Mercury?"),
"options": [qsTr("365 days"), qsTr("433 days"), qsTr("88 days"), qsTr("107 days")],
"closeness": [20.5, 1, 100, 94.5]
},
{ // sub-level 6
- "question": qsTr("How long is a day on Mercury?"),
+ "question": qsTr("How long is one rotation on Mercury?"),
"options": [qsTr("50 Earth days"), qsTr("365 Earth days"), qsTr("59 Earth days"), qsTr("107 Earth days")],
"closeness": [97, 1, 100, 84.4]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/venus.png",
"bodyName": qsTr("Venus"),
"bodySize": 0.22,
"temperatureHint": qsTr("The maximum temperature on Earth is 58 °C."),
"lengthOfYearHint": qsTr("The length of a year on Earth is 365 days."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Venus in the Solar System?"),
"options": [qsTr("Seventh"), qsTr("Sixth"), qsTr("Second"), qsTr("Fourth")],
"closeness": [1, 20.8, 100, 60.4]
},
{ // sub-level 2
"question": qsTr("Venus is as heavy as:"),
"options": [qsTr("0.7 Earths"), qsTr("0.8 Earths"), qsTr("1.3 Earths"), qsTr("2.5 Earths")],
"closeness": [94, 100, 71, 1]
},
{ // sub-level 3
"question": qsTr("How large is Venus compared to other planets in our Solar System?"),
"options": [qsTr("Seventh largest"), qsTr("Sixth largest"), qsTr("Fifth largest"), qsTr("Fourth largest")],
"closeness": [50.5, 100, 50.5, 1]
},
{ // sub-level 4
"question": qsTr("How long is a year on Venus?"),
"options": [qsTr("225 days"), qsTr("365 days"), qsTr("116 days"), qsTr("100 days")],
"closeness": [100, 1, 23, 11.6]
},
{ // sub-level 5
- "question": qsTr("How long is a day on Venus?"),
+ "question": qsTr("How long is one rotation on Venus?"),
"options": [qsTr("117 Earth days"), qsTr("365 Earth days"), qsTr("88 Earth days"), qsTr("107 Earth days")],
"closeness": [100, 1, 88.8, 96.4]
},
{ // sub-level 6
"question": qsTr("The maximum temperature on Venus is:"),
"options": [qsTr("100 °C"), qsTr("20 °C"), qsTr("467 °C"), qsTr("45 °C")],
"closeness": [18.7, 1, 100, 6.5]
},
{ // sub-level 7
"question": qsTr("How many moons has Venus?"),
"options": ["5", "10", "2", "0"],
- "closeness": [63, 1, 100, 75.3]
+ "closeness": [50, 1, 80, 100]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/earth.png",
"bodyName": qsTr("Earth"),
"bodySize": 0.3,
"temperatureHint": qsTr("The maximum temperature on Mars is 20 °C."),
"lengthOfYearHint": qsTr("The length of a year on Venus is 225 days."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Earth in the Solar System?"),
"options": [qsTr("Sixth"), qsTr("Third"), qsTr("First"), qsTr("Fifth")],
"closeness": [1, 100, 35, 35]
},
{ // sub-level 2
- "question": qsTr("How long does it take for Earth to complete one year?"),
+ "question": qsTr("How long does it take for Earth to make one revolution around the Sun?"),
"options": [qsTr("200 days"), qsTr("30 days"), qsTr("7 days"), qsTr("365 days")],
"closeness": [54.3, 7.3, 1, 100]
},
{ // sub-level 3
"question": qsTr("How many moons has Earth?"),
"options": ["1", "5", "2", "3"],
"closeness": [100, 15, 75, 50.5]
},
{ // sub-level 4
- "question": qsTr("How long is a day on Earth?"),
+ "question": qsTr("How long is one rotation on Earth?"),
"options": [qsTr("12 hours"), qsTr("24 hours"), qsTr("365 hours"), qsTr("48 hours")],
"closeness": [96.5, 100, 1, 93]
},
{ // sub-level 5
"question": qsTr("How many seasons has Earth?"),
"options": ["2", "4", "6", "1"],
"closeness": [34, 100, 34, 1]
},
{ // sub-level 6
"question": qsTr("Maximum temperature on Earth is:"),
"options": [qsTr("100 °C"), qsTr("58 °C"), qsTr("30 °C"), qsTr("45 °C")],
"closeness": [1, 100, 33, 69.3]
},
{ // sub-level 7
"question": qsTr("How large is Earth compared to other planets in our Solar System?"),
"options": [qsTr("Seventh largest"), qsTr("Sixth largest"), qsTr("Fifth largest"), qsTr("Fourth largest")],
"closeness": [1, 50.5, 100, 50.5]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/mars.png",
"bodyName": qsTr("Mars"),
"bodySize": 0.15,
"temperatureHint": qsTr("The maximum temperature on Earth is 58 °C."),
"lengthOfYearHint": qsTr("The length of a year on Earth is 365 days."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Mars in the Solar System?"),
"options": [qsTr("Sixth"), qsTr("Fourth"), qsTr("First"), qsTr("Fifth")],
"closeness": [34, 100, 1, 67]
},
{ // sub-level 2
"question": qsTr("The maximum temperature on Mars is:"),
"options": [qsTr("20 °C"), qsTr("35 °C"), qsTr("100 °C"), qsTr("60 °C")],
"closeness": [100, 81.4, 1, 51.5]
},
{ // sub-level 3
"question": qsTr("How big is the size of Mars compared to Earth?"),
"options": [qsTr("The same"), qsTr("Half"), qsTr("Two times"), qsTr("Three times")],
"closeness": [80, 100, 40.6, 1]
},
{ // sub-level 4
"question": qsTr("How many moons has Mars?"),
"options": ["1", "5", "2", "3"],
"closeness": [67, 1, 100, 50.5]
},
{ // sub-level 5
- "question": qsTr("How long is a day on Mars?"),
+ "question": qsTr("How long is one rotation on Mars?"),
"options": [qsTr("12 hours"), qsTr("24 hours"), qsTr("24.5 hours"), qsTr("48 hours")],
"closeness": [47.3, 91, 100, 1]
},
{ // sub-level 6
- "question": qsTr("How long does it take for Mars to complete one year?"),
+ "question": qsTr("How long does it take for Mars to make one revolution around the Sun?"),
"options": [qsTr("687 days"), qsTr("30 days"), qsTr("7 days"), qsTr("365 days")],
"closeness": [100, 4.3, 1, 53]
},
{ // sub-level 7
"question": qsTr("How small is Mars compared to other planets in our Solar System?"),
"options": [qsTr("Smallest"), qsTr("Second smallest"), qsTr("Third smallest"), qsTr("Fifth smallest")],
"closeness": [67, 100, 67, 1]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/jupiter.png",
"bodyName": qsTr("Jupiter"),
"bodySize": 1,
"temperatureHint": qsTr("The maximum temperature on Mars is 20 °C."),
"lengthOfYearHint": qsTr("The length of a year on Saturn is 29.5 Earth years."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Jupiter in the Solar System?"),
"options": [qsTr("Sixth"), qsTr("Fifth"), qsTr("First"), qsTr("Fourth")],
"closeness": [75, 100, 1, 75]
},
{ // sub-level 2
"question": qsTr("How large is Jupiter compared to other planets in the Solar System?"),
"options": [qsTr("Third largest"), qsTr("Largest"), qsTr("Fifth largest"), qsTr("Second largest")],
"closeness": [50.5, 100, 1, 75]
},
{ // sub-level 3
"question": qsTr("The minimum temperature on Jupiter is:"),
"options": [qsTr("-145 °C"), qsTr("100 °C"), qsTr("50 °C"), qsTr("-180 °C")],
"closeness": [100, 63, 24.7, 1]
},
{ // sub-level 4
"question": qsTr("How many moons has Jupiter?"),
- "options": ["1", "20", "25", "53"],
- "closeness": [1, 37, 46.7, 100]
+ "options": ["1", "79", "25", "53"],
+ "closeness": [1, 100, 32.1, 67.9]
},
{ // sub-level 5
- "question": qsTr("How long is one day on Jupiter?"),
+ "question": qsTr("How long is one rotation on Jupiter?"),
"options": [qsTr("10 hours"), qsTr("24 hours"), qsTr("12 hours"), qsTr("48 hours")],
"closeness": [100, 63.5, 94.8, 1]
},
{ // sub-level 6
- "question": qsTr("How long does it take for Jupiter to complete one year?"),
+ "question": qsTr("How long does it take for Jupiter to make one revolution around the Sun?"),
"options": [qsTr("5 Earth years"), qsTr("12 Earth years"), qsTr("30 Earth years"), qsTr("1 Earth year")],
"closeness": [61.5, 100, 1, 39.5]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/saturn.png",
"bodyName": qsTr("Saturn"),
"bodySize": 1.2,
"temperatureHint": qsTr("The minimum temperature on Jupiter is -145 °C."),
"lengthOfYearHint": qsTr("The length of a year on Jupiter is 12 Earth years."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Saturn in the Solar System?"),
"options": [qsTr("Sixth"), qsTr("Fourth"), qsTr("First"), qsTr("Fifth")],
"closeness": [100, 60.4, 1, 80]
},
{ // sub-level 2
"question": qsTr("How large is Saturn compared to other planets in the Solar System?"),
"options": [qsTr("Third largest"), qsTr("Largest"), qsTr("Fifth largest"), qsTr("Second largest")],
"closeness": [67, 67, 1, 100]
},
{ // sub-level 3
"question": qsTr("How many moons has Saturn?"),
- "options": ["120", "1", "150", "200"],
- "closeness": [80, 1, 100, 60.8]
+ "options": ["120", "1", "82", "200"],
+ "closeness": [32.2, 1, 100, 1]
},
{ // sub-level 4
- "question": qsTr("How long is one day on Saturn?"),
+ "question": qsTr("How long is one rotation on Saturn?"),
"options": [qsTr("10.5 hours"), qsTr("24 hours"), qsTr("12 hours"), qsTr("48 hours")],
"closeness": [100, 64.3, 96, 1]
},
{ // sub-level 5
"question": qsTr("The minimum temperature on Saturn is:"),
"options": [qsTr("0 °C"), qsTr("100 °C"), qsTr("-178 °C"), qsTr("-100 °C")],
"closeness": [36.6, 1, 100, 72]
},
{ // sub-level 6
- "question": qsTr("How long does it take for Saturn to complete one year?"),
+ "question": qsTr("How long does it take for Saturn to make one revolution around the Sun?"),
"options": [qsTr("29.5 Earth years"), qsTr("20 Earth years"), qsTr("10 Earth years"), qsTr("1 Earth year")],
"closeness": [100, 67, 32, 1]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/uranus.png",
"bodyName": qsTr("Uranus"),
"bodySize": 0.5,
"temperatureHint": qsTr("The temperature on Saturn is -178 °C."),
"lengthOfYearHint": qsTr("The length of a year on Saturn is 29.5 Earth years."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Uranus in the Solar System?"),
"options": [qsTr("Seventh"), qsTr("Fourth"), qsTr("Eighth"), qsTr("Fifth")],
"closeness": [100, 1, 67, 34]
},
{ // sub-level 2
"question": qsTr("How many years does it take for Uranus to go once around the Sun?"),
"options": [qsTr("1 year"), qsTr("24 years"), qsTr("68 years"), qsTr("84 years")],
"closeness": [1, 28.4, 81, 100]
},
{ // sub-level 3
"question": qsTr("How many moons has Uranus?"),
"options": ["120", "87", "27", "50"],
"closeness": [1, 36, 100, 75.5]
},
{ // sub-level 4
- "question": qsTr("How long is one day on Uranus?"),
+ "question": qsTr("How long is one rotation on Uranus?"),
"options": [qsTr("10 hours"), qsTr("27 hours"), qsTr("17 hours"), qsTr("48 hours")],
"closeness": [77.6, 68, 100, 1]
},
{ // sub-level 5
"question": qsTr("How large is Uranus compared to other planets in the Solar System?"),
"options": [qsTr("Third largest"), qsTr("Largest"), qsTr("Seventh largest"), qsTr("Second largest")],
"closeness": [100, 50.5, 1, 75]
},
{ // sub-level 6
"question": qsTr("The maximum temperature on Uranus is:"),
"options": [qsTr("100 °C"), qsTr("-216 °C"), qsTr("0 °C"), qsTr("-100 °C")],
"closeness": [1, 100, 32.3, 63.6]
}
]
},
{
"realImg": "qrc:/gcompris/src/activities/solar_system/resource/neptune.png",
"bodyName": qsTr("Neptune"),
"bodySize": 0.4,
"temperatureHint": qsTr("The maximum temperature on Saturn is -178 °C."),
"lengthOfYearHint": qsTr("The length of a year on Uranus is 84 years."),
"levels": [
{ // sub-level 1
"question": qsTr("At which position is Neptune in the Solar System?"),
"options": [qsTr("Seventh"), qsTr("Fourth"), qsTr("Eighth"), qsTr("Fifth")],
"closeness": [75, 1, 100, 25.7]
},
{ // sub-level 2
"question": qsTr("How long does it take for Neptune to make one revolution around the Sun?"),
"options": [qsTr("165 years"), qsTr("3 years"), qsTr("100 years"), qsTr("1 year")],
"closeness": [100, 2, 60.7, 1]
},
{ // sub-level 3
"question": qsTr("How many moons has Neptune?"),
"options": ["120", "87", "14", "50"],
"closeness": [1, 31.8, 100, 66.3]
},
{ // sub-level 4
- "question": qsTr("How long is one day on Neptune?"),
+ "question": qsTr("How long is one rotation on Neptune?"),
"options": [qsTr("16 hours"), qsTr("27 hours"), qsTr("17 hours"), qsTr("48 hours")],
"closeness": [100, 66, 97, 1]
},
{ // sub-level 5
"question": qsTr("The average temperature on Neptune is:"),
"options": [qsTr("100 °C"), qsTr("30 °C"), qsTr("-210 °C"), qsTr("-100 °C")],
"closeness": [1, 23, 100, 64]
},
{ // sub-level 6
"question": qsTr("How large is Neptune compared to other planets in the Solar System?"),
"options": [qsTr("Fourth largest"), qsTr("Largest"), qsTr("Third largest"), qsTr("Second largest")],
"closeness": [100, 1, 67, 34]
}
]
}
];
}
diff --git a/src/activities/solar_system/QuizScreen.qml b/src/activities/solar_system/QuizScreen.qml
index 084460ae0..8a5bfc72a 100644
--- a/src/activities/solar_system/QuizScreen.qml
+++ b/src/activities/solar_system/QuizScreen.qml
@@ -1,307 +1,315 @@
/* GCompris - QuizScreen.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import QtGraphicalEffects 1.0
import QtQuick.Controls 1.5
import "../../core"
import "solar_system.js" as Activity
Item {
id: mainQuizScreen
width: parent.width
height: parent.height
focus: true
property alias score: score
property alias optionListModel: optionListModel
property alias restartAssessmentMessage: restartAssessmentMessage
property alias blockAnswerButtons: optionListView.blockAnswerButtons
property alias closenessMeter: closenessMeter
property string planetRealImage
property string question
property string closenessMeterValue
property int numberOfCorrectAnswers: 0
Rectangle {
id: questionArea
anchors.right: score.left
anchors.top: parent.top
anchors.left: parent.left
anchors.margins: 10 * ApplicationInfo.ratio
height: questionText.height + 10 * ApplicationInfo.ratio
color: 'white'
radius: 10
border.width: 3
opacity: 0.8
border.color: "black"
GCText {
id: questionText
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.centerIn: parent.Center
color: "black"
width: parent.width
wrapMode: Text.Wrap
text: mainQuizScreen.question
}
}
// Model of options for a question
ListModel {
id: optionListModel
}
// This grid has image of the planet in its first column/row (row in case of vertical screen) and the options on the 2nd column/row
Grid {
id: imageAndOptionGrid
columns: (background.horizontalLayout && !items.assessmentMode && items.bar.level != 2) ? 2 : 1
spacing: 10 * ApplicationInfo.ratio
anchors.top: (questionArea.y + questionArea.height) > (score.y + score.height) ? questionArea.bottom : score.bottom
anchors.left: parent.left
anchors.right: parent.right
// An item to hold image of the planet
Item {
width: background.horizontalLayout ? background.width * 0.40
: background.width - imageAndOptionGrid.anchors.margins * 2
height: background.horizontalLayout ? background.height - bar.height - questionArea.height - 10 * ApplicationInfo.ratio
: (background.height - bar.height - questionArea.height - 10 * ApplicationInfo.ratio) * 0.37
visible: !items.assessmentMode && (items.bar.level != 2)
Image {
id: planetImageMain
sourceSize.width: Math.min(parent.width, parent.height) * 0.9
anchors.centerIn: parent
source: mainQuizScreen.planetRealImage
fillMode: Image.PreserveAspectCrop
}
}
// An item to hold the list view of options
Item {
width: ( items.assessmentMode || items.bar.level == 2 ) ? mainQuizScreen.width
: background.horizontalLayout ? background.width * 0.55
: background.width - imageAndOptionGrid.anchors.margins * 2
height: background.horizontalLayout ? itemHeightHorizontal
: itemHeightVertical
readonly property real itemHeightHorizontal: background.height - bar.height - closenessMeter.height - questionArea.height - 10 * ApplicationInfo.ratio
readonly property real itemHeightVertical: (items.bar.level != 2 && !items.assessmentMode) ? itemHeightHorizontal * 0.39
: itemHeightHorizontal * 0.8
ListView {
id: optionListView
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
width: background.horizontalLayout ? background.width * 0.40
: background.width - imageAndOptionGrid.anchors.margins * 2
height: background.horizontalLayout ? background.height - bar.height - closenessMeter.height * 1.5 - questionArea.height - 50 * ApplicationInfo.ratio
: parent.itemHeightVertical
spacing: background.horizontalLayout ? 10 * ApplicationInfo.ratio : 7.5 * ApplicationInfo.ratio
orientation: Qt.Vertical
verticalLayoutDirection: ListView.TopToBottom
interactive: false
model: optionListModel
readonly property real buttonHeight: (height - 3 * spacing) / 4
add: Transition {
NumberAnimation { properties: "y"; from: parent.y; duration: 500 }
onRunningChanged: {
optionListView.blockAnswerButtons = running
}
}
property bool blockAnswerButtons: false
delegate: AnswerButton {
id: optionButton
width: parent.width
height: optionListView.buttonHeight
textLabel: optionValue
anchors.right: parent.right
anchors.left: parent.left
blockAllButtonClicks: optionListView.blockAnswerButtons
isCorrectAnswer: closeness === 100
onPressed: optionListView.blockAnswerButtons = true
onIncorrectlyPressed: {
if(!items.assessmentMode) {
closenessMeter.stopAnimations()
closenessMeterIncorrectAnswerAnimation.start()
mainQuizScreen.closenessMeterValue = closeness
}
else {
optionListView.blockAnswerButtons = false
Activity.appendAndAddQuestion()
}
}
onCorrectlyPressed: {
if(!items.assessmentMode) {
closenessMeter.stopAnimations()
particles.burst(30)
closenessMeterCorrectAnswerAnimation.start()
mainQuizScreen.closenessMeterValue = closeness
}
else {
Activity.assessmentModeQuestions.shift()
mainQuizScreen.numberOfCorrectAnswers++
Activity.nextSubLevel(true)
}
}
}
}
}
}
Rectangle {
id: closenessMeter
x: ((background.width - items.bar.barZoom * items.bar.fullButton * 5.6) < (width + 10 * ApplicationInfo.ratio) && background.horizontalLayout) ? background.width - width - 42 * ApplicationInfo.ratio : background.width - width - 10 * ApplicationInfo.ratio
y: (background.width - items.bar.barZoom * items.bar.fullButton * 5.6) < (width + 10 * ApplicationInfo.ratio) ? background.height - bar.height - height - 10 * ApplicationInfo.ratio : background.height - height - 10 * ApplicationInfo.ratio
height: 40 * ApplicationInfo.ratio
width: 150 * ApplicationInfo.ratio
radius: width * 0.06
border.width: 2
border.color: "black"
opacity: 0.78
visible: !items.assessmentMode
Item {
width: parent.width - 3 * ApplicationInfo.ratio
height: parent.height
anchors.centerIn: parent
GCText {
id: closenessText
color: "black"
anchors.fill: parent
fontSizeMode: Text.Fit
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: qsTr("Accuracy: %1%").arg(closenessMeterValue)
}
}
SequentialAnimation {
id: closenessMeterIncorrectAnswerAnimation
onStarted: optionListView.blockAnswerButtons = true
NumberAnimation { target: closenessMeter; property: "scale"; to: 1.1; duration: 450 }
NumberAnimation { target: closenessMeter; property: "scale"; to: 1.0; duration: 450 }
onStopped: optionListView.blockAnswerButtons = false
}
SequentialAnimation {
id: closenessMeterCorrectAnswerAnimation
onStarted: optionListView.blockAnswerButtons = true
NumberAnimation { target: closenessMeter; property: "scale"; to: 1.1; duration: 450 }
NumberAnimation { target: closenessMeter; property: "scale"; to: 1.0; duration: 450 }
NumberAnimation { target: closenessMeter; property: "scale"; to: 1.1; duration: 450 }
NumberAnimation { target: closenessMeter; property: "scale"; to: 1.0; duration: 450 }
ScriptAction { script: { Activity.nextSubLevel() } }
}
ParticleSystemStarLoader {
id: particles
clip: false
}
function stopAnimations() {
optionListView.blockAnswerButtons = false
closenessMeterCorrectAnswerAnimation.stop()
closenessMeterIncorrectAnswerAnimation.stop()
}
}
ProgressBar {
id: progressBar
height: bar.height * 0.35
width: parent.width * 0.35
readonly property real percentage: (mainQuizScreen.numberOfCorrectAnswers / score.numberOfSubLevels) * 100
readonly property string message: qsTr("%1%").arg(value)
value: Math.round(percentage * 10) / 10
maximumValue: 100
visible: items.assessmentMode
y: parent.height - bar.height - height - 10 * ApplicationInfo.ratio
x: parent.width - width * 1.1
GCText {
id: progressbarText
anchors.centerIn: parent
fontSize: mediumSize
font.bold: true
color: "black"
text: parent.message
z: 2
}
+ Rectangle {
+ z: -1
+ radius: 5 * ApplicationInfo.ratio
+ anchors.centerIn: parent
+ height: progressbarText.height
+ width: parent.width
+ color: "#80EEEEEE"
+ }
}
Rectangle {
id: restartAssessmentMessage
width: parent.width
height: parent.height - bar.height * 1.25
anchors.top: parent.top
anchors.margins: 10 * ApplicationInfo.ratio
anchors.horizontalCenter: parent.horizontalCenter
radius: 4 * ApplicationInfo.ratio
visible: items.assessmentMode && (score.currentSubLevel >= score.numberOfSubLevels)
z: 4
GCText {
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
fontSizeMode: mediumSize
text: qsTr("Your final score is: <font color=\"#3bb0de\">%1%</font>.<br><br>%2").arg(progressBar.value).arg(progressBar.value <= 90 ? qsTr("You should score above 90% to become a Solar System expert!<br>Retry to test your skills again or train in normal mode to explore more about the Solar System.") : qsTr("Great! You can replay the assessment to test your knowledge on more questions."))
}
// To prevent clicking on options under it
MouseArea {
anchors.fill: parent
}
onVisibleChanged: scaleAnimation.start()
NumberAnimation {
id: scaleAnimation
target: restartAssessmentMessage
properties: "scale"
from: 0
to: 1
duration: 1500
easing.type: Easing.OutBounce
}
}
Score {
id: score
anchors.bottom: undefined
anchors.right: parent.right
anchors.rightMargin: 10 * ApplicationInfo.ratio
anchors.top: parent.top
z: 0
}
}
diff --git a/src/activities/sudoku/ActivityInfo.qml b/src/activities/sudoku/ActivityInfo.qml
index e4f762342..8ae8776f0 100644
--- a/src/activities/sudoku/ActivityInfo.qml
+++ b/src/activities/sudoku/ActivityInfo.qml
@@ -1,40 +1,40 @@
/* GCompris - ActivityInfo.qml
*
* Copyright (C) 2015 Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import GCompris 1.0
ActivityInfo {
name: "sudoku/Sudoku.qml"
difficulty: 4
icon: "sudoku/sudoku.svg"
author: "Johnny Jazeix &lt;jazeix@gmail.com&gt;"
demo: true
//: Activity title
title: qsTr("Sudoku, place unique symbols in a grid")
//: Help title
description: qsTr("Symbols must be unique in a row, in a column, and (if defined) each region.")
// intro: "Select a number or a symbol and click its target area. Each symbol must appear only once in a row, in a column and in a subregion if any."
//: Help goal
- goal: qsTr("The aim of the puzzle is to enter a symbol or numeral from 1 through 9 in each cell of a grid. In the official Sudoku the grid is 9x9 made up of 3x3 subgrids (called 'regions'). In GCompris we start at lower levels with a simpler version using symbols and with no regions. In all cases the grid is presented with various symbols or numerals given in some cells (the 'givens'). Each row, column and region must contain only one instance of each symbol or numeral (Source &lt;http://en.wikipedia.org/wiki/Sudoku&gt;).")
+ goal: qsTr("The aim of the puzzle is to enter a symbol or numeral from 1 through 9 in each cell of a grid. In the official Sudoku the grid is 9x9 made up of 3x3 subgrids (called 'regions'). In GCompris we start at lower levels with a simpler version using symbols and with no regions. In all cases the grid is presented with various symbols or numerals given in some cells (the 'givens'). Each row, column and region must contain only one instance of each symbol or numeral (Source &lt;https://en.wikipedia.org/wiki/Sudoku&gt;).")
//: Help prerequisite
prerequisite: qsTr("Completing the puzzle requires patience and logical ability")
//: Help manual
manual: qsTr("Select a number or a symbol on the left and click on its target position. GCompris will not let you enter invalid data.")
credit: ""
section: "discovery logic"
createdInVersion: 0
}
diff --git a/src/activities/sudoku/Sudoku.qml b/src/activities/sudoku/Sudoku.qml
index f41b67c92..e870c89d3 100644
--- a/src/activities/sudoku/Sudoku.qml
+++ b/src/activities/sudoku/Sudoku.qml
@@ -1,210 +1,212 @@
/* gcompris - Sudoku.qml
Copyright (C) 2014 Johnny Jazeix <jazeix@gmail.com>
2003, 2014: Bruno Coudoin: initial version
2014: Johnny Jazeix: Qt port
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "sudoku.js" as Activity
import "."
ActivityBase {
id: activity
focus: true
onStart: {focus=true}
onStop: {}
pageComponent: Image {
id: background
anchors.fill: parent
source: Activity.url + "background.svg"
sourceSize.width: Math.max(parent.width, parent.height)
fillMode: Image.PreserveAspectCrop
signal start
signal stop
Component.onCompleted: {
activity.start.connect(start)
activity.stop.connect(stop)
focus = true
}
property int nbRegions
QtObject {
id: items
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias score: score
property GCSfx audioEffects: activity.audioEffects
property alias availablePiecesModel: availablePieces
property alias columns: sudoColumn.columns
property alias rows: sudoColumn.rows
property alias sudokuModel: sudokuModel
}
onStart: Activity.start(items)
onStop: { Activity.stop() }
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
content: BarEnumContent { value: help | home | level | reload }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onReloadClicked: Activity.initLevel()
onHomeClicked: activity.home()
}
Bonus {
id: bonus
z: 1002
Component.onCompleted: win.connect(Activity.incrementLevel)
}
Score {
id: score
z: 1003
- anchors.bottom: background.bottom
+ height: background.height - availablePieces.height - 1.5 * bar.height
+ anchors.bottom: bar.top
anchors.right: background.right
+ anchors.bottomMargin: 10 * ApplicationInfo.ratio
}
Keys.onPressed: {
Activity.onKeyPressed(event);
}
SudokuListWidget {
id: availablePieces
audioEffects: activity.audioEffects
}
ListModel {
id: sudokuModel
}
Grid {
z: 100
anchors {
left: availablePieces.right
top: parent.top
topMargin: 2 * ApplicationInfo.ratio
}
id: sudoColumn
width: Math.min(background.width - availablePieces.width -
availablePieces.anchors.leftMargin,
background.height - 2 * bar.height)
height: width
Repeater {
id: repeater
model: sudokuModel
delegate: blueSquare
Component {
id: blueSquare
SudokuCase {
x: (index%sudoColumn.columns)*width
y: Math.floor(index/sudoColumn.columns)*height
width: parent != null ? parent.width / sudoColumn.columns : 1
height: parent != null ? parent.height/ sudoColumn.columns : 1
gridIndex: index
isInitial: initial
text: textValue
state: mState
}
}
}
}
MouseArea {
id: dynamic
anchors.fill: sudoColumn
hoverEnabled: true
property int previousHoveredCase: -1
onPositionChanged: {
var x = Math.floor(sudoColumn.rows * mouseX / (sudoColumn.width+1));
var y = Math.floor(sudoColumn.columns * mouseY / (sudoColumn.height+1));
var id = x + y * sudoColumn.rows;
// Only color if we can modify the case
if(sudokuModel.get(id).mState === "default")
sudokuModel.get(id).mState = "hovered";
// Restore previous case if different from the new one
if(previousHoveredCase != id) {
if(previousHoveredCase != -1 && sudokuModel.get(previousHoveredCase).mState === "hovered")
sudokuModel.get(previousHoveredCase).mState = "default"
previousHoveredCase = id
}
}
onExited: {
if(previousHoveredCase != -1 && sudokuModel.get(previousHoveredCase).mState === "hovered")
sudokuModel.get(previousHoveredCase).mState = "default"
previousHoveredCase = -1
}
onClicked: {
var x = Math.floor(sudoColumn.rows * mouseX / sudoColumn.width);
var y = Math.floor(sudoColumn.columns * mouseY / sudoColumn.height);
Activity.clickOn(x, y)
}
}
Grid {
z: 1001
id: regionGrid
columns: rows
rows: nbRegions
visible: nbRegions > 1
anchors.fill: sudoColumn
Repeater {
id: regionRepeater
model: nbRegions*nbRegions
Rectangle {
z: 1001
color: "transparent"
border.color: "orange"
border.width: 4
x: index / nbRegions * sudoColumn.width
y: (index % nbRegions) * sudoColumn.width
width: nbRegions * sudoColumn.width / sudoColumn.columns
height: nbRegions * sudoColumn.height/ sudoColumn.columns
}
}
}
}
}
diff --git a/src/activities/tangram/dataset.js b/src/activities/tangram/dataset.js
index 8a9eafa74..f2a0d724c 100644
--- a/src/activities/tangram/dataset.js
+++ b/src/activities/tangram/dataset.js
@@ -1,4844 +1,4732 @@
.pragma library
/* dataset format
- for each level we have:
- bg: an optional background image
- colorMask: the color of the shadowed target items
- a list of pieces that each holds:
- img: piece file name
- flippable: is the piece flippable
- flipping: target flipping state
- x: target x position
- y: target y position
- width: item width
- height: item height
- rotation: item target rotation
- moduloRotation: modulo rotation
- initX: initial x position
- initY: innitial y position
- initRotation: initial rotation
- initFlipping: initial flipping
*/
/* Warning: there are more levels in toBeAligned.js there are a lot of levels
the needs to be manually aligned in editor mode and added to this file
*/
var dataset = [
{
'bg': '',
'name': 'Level 5 Real Tangram',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.22,
'initY': 0.12,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.501,
'y': 0.349
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.216,
'initY': 0.8,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.715,
'y': 0.349
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.45,
'initY': 0.11,
'moduloRotation': 360,
'rotation': 90,
'width': 0.304,
'x': 0.6649999999999999,
'y': 0.6066176295413936
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.7,
'initY': 0.11,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5145955926146515,
'y': 0.5308088147706969
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 1,
'initRotation': -90,
'initX': 0.94,
'initY': 0.17,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.7515955926146516,
'y': 0.5094044073853484
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.6,
'initY': 0.85,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.18189398451459207,
'y': 0.40211435378201305
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.8,
'initY': 0.85,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.4021441334127456,
'y': 0.49324002382370435
},
]
},
{
'bg': '',
'name': 'Imported level 0',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 270,
'width': 0.429,
'x': 0.42724419297200705,
'y': 0.32462656343061347
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.15611554496724236,
'y': 0.7651739130434781
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 270,
'width': 0.304,
'x': 0.7600893388921978,
'y': 0.689886837403216
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.45834961286480047,
'y': 0.614650982727814
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.2307069684335914,
'y': 0.4632888624181061
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.3449309112567005,
'y': 0.5766063132817155
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.5708940134670106,
'y': 0.6522900536033351
},
]
},
{
'bg': '',
'name': 'Imported level 6',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.4596351325618991,
'y': 0.8658572572960096
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.6113977554666894,
'y': 0.8658572572960096
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.5352187191355399,
'y': 0.5652531562154344
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.536409904364843,
'y': 0.3820744988513571
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.5898954388666723,
'y': 0.2222133451033778
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 90,
'width': 0.215,
'x': 0.4827649630732577,
'y': 0.2745076943759041
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.48308363379562685,
'y': 0.16872766774440565
},
]
},
{
'bg': '',
'name': 'Imported level 8',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.5023814654981706,
'y': 0.8294092119458861
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.5044453080915509,
'y': 0.24822376218837738
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.5580901065259934,
'y': 0.4091168372330469
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5038929788139199,
'y': 0.6465217524887263
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.3443070895941462,
'y': 0.1959292700587084
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.5053594285714285,
'y': 0.5166836417084999
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.34410621968859023,
'y': 0.3554304328256615
},
]
},
{
'bg': '',
'name': 'Imported level 9',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.38185774993618643,
'y': 0.49611427193057084
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.8324945144218497,
'y': 0.49611427193057084
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.6068782644431209,
'y': 0.497305457159874
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.8264392276014633,
'y': 0.34552855824044926
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.15451412151791039,
'y': 0.49675131796137156
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.721980888624181,
'y': 0.2324369129583935
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.9487881809750702,
'y': 0.2324369129583935
},
]
},
{
'bg': '',
'name': 'Imported level 10',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.7177664225304178,
'y': 0.27648363456138847
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.2771954897472985,
'y': 0.7580107131796135
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.6425140732578916,
'y': 0.5773520909555007
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5179394382710797,
'y': 0.5193719275078705
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.4650494963839018,
'y': 0.35951077375989116
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.6050201477069685,
'y': 0.6904580122521908
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.4490578874329959,
'y': 0.1929193179613716
},
]
},
{
'bg': '',
'name': 'Imported level 11',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.343738391049094,
'y': 0.5413064867693356
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.47293088198757754,
'y': 0.7540161192886923
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.7088762542329619,
'y': 0.5729427676337956
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.34395914592019045,
'y': 0.3584161114609036
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.6111663492725262,
'y': 0.48809787415978895
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 90,
'width': 0.215,
'x': 0.7179782972007147,
'y': 0.30080569922572953
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.8913969315919342,
'y': 0.701881033948779
},
]
},
- {
- 'bg': '',
- 'name': 'Imported level 12',
- 'colorMask': '#999',
- 'pieces': [
- {
- 'img': 'tangram/p0.svg',
- 'flippable': 0,
- 'flipping': false,
- 'height': 0.214,
- 'initFlipping': 0,
- 'initRotation': 180,
- 'initX': 0.217,
- 'initY': 0.112,
- 'moduloRotation': 360,
- 'rotation': 157.5,
- 'width': 0.429,
- 'x': 0.48378610108057524,
- 'y': 0.5281706585552625
- },
- {
- 'img': 'tangram/p0.svg',
- 'flippable': 0,
- 'flipping': false,
- 'height': 0.214,
- 'initFlipping': 0,
- 'initRotation': 0,
- 'initX': 0.442,
- 'initY': 0.113,
- 'moduloRotation': 360,
- 'rotation': 337.5,
- 'width': 0.429,
- 'x': 0.6813192857142856,
- 'y': 0.44696344975750885
- },
- {
- 'img': 'tangram/p1.svg',
- 'flippable': 0,
- 'flipping': false,
- 'height': 0.152,
- 'initFlipping': 0,
- 'initRotation': 180,
- 'initX': 0.61,
- 'initY': 0.08,
- 'moduloRotation': 360,
- 'rotation': 337.5,
- 'width': 0.304,
- 'x': 0.412606268186846,
- 'y': 0.1967451961201396
- },
- {
- 'img': 'tangram/p2.svg',
- 'flippable': 0,
- 'flipping': false,
- 'height': 0.152,
- 'initFlipping': 0,
- 'initRotation': 0,
- 'initX': 0.911,
- 'initY': 0.081,
- 'moduloRotation': 90,
- 'rotation': 67.5,
- 'width': 0.152,
- 'x': 0.3444424485663234,
- 'y': 0.38844723423806676
- },
- {
- 'img': 'tangram/p3.svg',
- 'flippable': 1,
- 'flipping': false,
- 'height': 0.108,
- 'initFlipping': 0,
- 'initRotation': 45,
- 'initX': 0.083,
- 'initY': 0.178,
- 'moduloRotation': 180,
- 'rotation': 0,
- 'width': 0.322,
- 'x': 0.7404922390028078,
- 'y': 0.2614944703479963
- },
- {
- 'img': 'tangram/p4.svg',
- 'flippable': 0,
- 'flipping': false,
- 'height': 0.108,
- 'initFlipping': 0,
- 'initRotation': 135,
- 'initX': 0.741,
- 'initY': 0.118,
- 'moduloRotation': 360,
- 'rotation': 22.5,
- 'width': 0.215,
- 'x': 0.7627900962307498,
- 'y': 0.569599191270314
- },
- {
- 'img': 'tangram/p4.svg',
- 'flippable': 0,
- 'flipping': false,
- 'height': 0.108,
- 'initFlipping': 0,
- 'initRotation': 45,
- 'initX': 0.946,
- 'initY': 0.205,
- 'moduloRotation': 360,
- 'rotation': 337.5,
- 'width': 0.215,
- 'x': 0.40648443886667235,
- 'y': 0.6178664400578577
- },
- ]
- },
{
'bg': '',
'name': 'Imported level 13',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.2638586309027482,
'y': 0.6620276109078531
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.7175584431209051,
'y': 0.6625947943503786
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.5402684068748407,
'y': 0.5333664093422956
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5934897143707991,
'y': 0.2656298300859355
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.8691330121671061,
'y': 0.7381158602909895
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.4908645017442356,
'y': 0.6394517670382031
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.18407762971156308,
'y': 0.5332945214838765
},
]
},
{
'bg': '',
'name': 'Imported level 14',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.4457249624776654,
'y': 0.3811788395303327
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.7475202487875435,
'y': 0.6829741258402109
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.46828760954649884,
'y': 0.6164643159193397
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.596934535097422,
'y': 0.5317645532204544
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.7260177893303837,
'y': 0.4038724842167957
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.5594263335318641,
'y': 0.64485619850251
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.7789078740747042,
'y': 0.2973376010380328
},
]
},
{
'bg': '',
'name': 'Imported level 15',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.3699737826086957,
'y': 0.3832792040330129
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.671769068918574,
'y': 0.6838833051135882
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 225,
'width': 0.304,
'x': 0.2832376501318812,
'y': 0.5544194613290223
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5199639036841659,
'y': 0.532106549051306
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.5955616234152982,
'y': 0.38150670220369254
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.3316203964945121,
'y': 0.6455583281715307
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.19150319067472138,
'y': 0.5072279001956946
},
]
},
{
'bg': '',
'name': 'Imported level 16',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.2883534285714286,
'y': 0.18657742857142856
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.7144513553135369,
'y': 0.18657742857142856
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 225,
'width': 0.304,
'x': 0.6615862948183441,
'y': 0.5612425913383816
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5011571107802262,
'y': 0.4000471022717604
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.34090533293627173,
'y': 0.3467173444227006
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.5547518238747553,
'y': 0.50742457925636
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.5018052899685187,
'y': 0.5605088904109589
},
]
},
{
'bg': '',
'name': 'Imported level 17',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.36401785646217993,
'y': 0.4041249455458182
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.6664087353867099,
'y': 0.7059202318556965
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.5998989254658383,
'y': 0.4254964073853485
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5151991627669532,
'y': 0.5547390684080661
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.3867115011486428,
'y': 0.6838223226410278
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.6282908080490088,
'y': 0.5166352742278567
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.22625468335744067,
'y': 0.6839815865736408
},
]
},
{
'bg': '',
'name': 'Imported level 18',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.3689950665362035,
'y': 0.5227800890836382
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.5067583110695142,
'y': 0.7050162167957115
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 315,
'width': 0.304,
'x': 0.44099048966221394,
'y': 0.22960923985365442
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.4943167602314302,
'y': 0.3910979075129754
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.6541779139794095,
'y': 0.33642118778184305
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.25532196179698813,
'y': 0.3340623148983238
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 90,
'width': 0.215,
'x': 0.4971569993193226,
'y': 0.8557539934484812
},
]
},
{
'bg': '',
'name': 'Imported level 19',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.5092028486343912,
'y': 0.5608064499276779
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.32756231353696913,
'y': 0.5485370310559007
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 45,
'width': 0.304,
'x': 0.4552808425933804,
'y': 0.292942163022207
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5628892530417767,
'y': 0.7206607294307836
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.6694137118182593,
'y': 0.5074142660597296
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.6692648722879264,
'y': 0.7737099352505743
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.6159281773164298,
'y': 0.4006023181315411
},
]
},
{
'bg': '',
'name': 'Imported level 20',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.7089075290564113,
'y': 0.35880960946141416
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.494965105334808,
'y': 0.35885121543435716
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 90,
'width': 0.304,
'x': 0.6602167415128053,
'y': 0.6172947886497064
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5090070260359059,
'y': 0.5411014763039222
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.7450616349868119,
'y': 0.518989433931762
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.3953197881391984,
'y': 0.5035934175955075
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.17413425670041696,
'y': 0.4116645374797924
},
]
},
{
'bg': '',
'name': 'Imported level 21',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.2931057209223177,
'y': 0.5933563100484984
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.7197992402790777,
'y': 0.5933563100484984
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.5058568165574747,
'y': 0.7756208469326983
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5064524091721263,
'y': 0.3790953584616694
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.5599380865310986,
'y': 0.5383609195949971
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 90,
'width': 0.215,
'x': 0.4534032033523357,
'y': 0.4854709777078194
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.45312613860290984,
'y': 0.5918465969539692
},
]
},
{
'bg': '',
'name': 'Imported level 22',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.8013717475538161,
'y': 0.4862541065259934
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.13619710958904108,
'y': 0.48684969914064496
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.46521087288351914,
'y': 0.7456118002212202
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.4687844285714286,
'y': 0.5624331428571429
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.30773208959414605,
'y': 0.6159188202161151
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.574564455202927,
'y': 0.6160780841487281
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.6815356670637285,
'y': 0.6157595562835021
},
]
},
{
'bg': '',
'name': 'Imported level 23',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.29609742074363987,
'y': 0.49720990632179013
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.7503075980600699,
'y': 0.49720990632179013
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.507419305113588,
'y': 0.6484053457840553
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5235003057091806,
'y': 0.4661774651720127
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.9014889043648434,
'y': 0.4215980534331661
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.18301990861907608,
'y': 0.4590919789840891
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.10800350548796049,
'y': 0.38410412788224285
},
]
},
{
'bg': '',
'name': 'Imported level 24',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.4735713910490937,
'y': 0.5605857965625799
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.688705,
'y': 0.3472805714285715
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 225,
'width': 0.304,
'x': 0.3126783160044244,
'y': 0.40088390674721347
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.4735713910490937,
'y': 0.3481532287926487
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.2055478402110099,
'y': 0.40163890615162084
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.7938894340168466,
'y': 0.5072595259933633
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.0993316277546158,
'y': 0.4545288480387986
},
]
},
{
'bg': '',
'name': 'Imported level 25',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.31210792495533063,
'y': 0.4947798753509741
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.7429705926146515,
'y': 0.4953754679656257
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.5320062748234494,
'y': 0.6764486767633795
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.5278371265208884,
'y': 0.4962479824725602
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.15105558597804822,
'y': 0.44216685535607925
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.849941804475453,
'y': 0.44200759142346635
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.956913016336255,
'y': 0.44232611928869225
},
]
},
{
'bg': '',
'name': 'Imported level 26',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.870166751808049,
'y': 0.5098080346294563
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.5507629721773163,
'y': 0.6165021817408322
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.2843669352505742,
'y': 0.454972050965711
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.3374161410703649,
'y': 0.6161836538756061
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.7106241259252957,
'y': 0.5626981193737769
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.39106108236195014,
'y': 0.5098080346294566
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.23104066468135803,
'y': 0.5619432628265124
},
]
},
{
'bg': '',
'name': 'Imported level 27',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.8417641737428743,
'y': 0.4076161376669786
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 270,
'width': 0.429,
'x': 0.2041477997107121,
'y': 0.4016602115204628
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.575686807538501,
'y': 0.45796444516293716
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.4165805103377862,
'y': 0.4040425819790691
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.6828172833319153,
'y': 0.4599106297966477
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.5229559867267933,
'y': 0.5649356570237386
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 90,
'width': 0.215,
'x': 0.3635311616608525,
'y': 0.5092270159959159
},
]
},
{
'bg': '',
'name': 'Imported level 28',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.6627741289032587,
'y': 0.6464996858674382
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.5127414654981706,
'y': 0.49527583723304697
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 270,
'width': 0.304,
'x': 0.3615460260359058,
'y': 0.42028784327405777
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.3615603020505404,
'y': 0.6470810024674549
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.4371580217816727,
'y': 0.79827644192972
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.47524753994724755,
'y': 0.30718206483451027
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.32405210048498245,
'y': 0.5339893571853995
},
]
},
{
'bg': '',
'name': 'Imported level 29',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.8606828474432059,
'y': 0.4573111362205395
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.7100545914234663,
'y': 0.607939392240279
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.7856664443120907,
'y': 0.7585392390878924
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.2576735914234664,
'y': 0.3073210151450693
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.5588732851186932,
'y': 0.5335185817238152
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.445186047221986,
'y': 0.4204128032842679
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.37076537956266487,
'y': 0.3454248093252786
},
]
},
{
'bg': '',
'name': 'Imported level 30',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.4035540489236792,
'y': 0.5776136265634306
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.5547210792138176,
'y': 0.5770464431209054
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.6303330749595848,
'y': 0.4258510036586403
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.40294432315153583,
'y': 0.4264323202586574
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.4785420428826684,
'y': 0.27523688079639236
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.28925699954054296,
'y': 0.4639405218242151
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.5172271536628946,
'y': 0.765140215519442
},
]
},
{
'bg': '',
'name': 'Imported level 31',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.37139204773249396,
'y': 0.3805859649451203
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.37139204773249396,
'y': 0.5317529952352591
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.5981710737683996,
'y': 0.5323485878499107
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.522573354037267,
'y': 0.3805716889304859
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.6737687934995319,
'y': 0.4561694086616183
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.48506515247170934,
'y': 0.494259069684336
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.7118724448225985,
'y': 0.3430636302220709
},
]
},
{
'bg': '',
'name': 'Imported level 32',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.24633358776482608,
'y': 0.2252940417765677
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.460275868629286,
'y': 0.22584802841827617
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 135,
'width': 0.304,
'x': 0.6199777584446524,
'y': 0.2794929697098613
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.3846781488981537,
'y': 0.40754430264613295
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.38408255628350213,
'y': 0.6343374618395303
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.4215907578490598,
'y': 0.5206359479281886
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.3459789049604357,
'y': 0.7480389757508721
},
]
},
{
'bg': '',
'name': 'Imported level 33',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.707001553816047,
'y': 0.492399627244108
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 270,
'width': 0.429,
'x': 0.2235373232366204,
'y': 0.4048757792053093
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 180,
'width': 0.304,
'x': 0.48019411860801503,
'y': 0.3417997803964945
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.4045963988768825,
'y': 0.4929809438441249
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.5557918383391476,
'y': 0.41797881672764403
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.3676839327831192,
'y': 0.38048489117672085
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.6694792190929976,
'y': 0.30427744567344506
},
]
},
{
'bg': '',
'name': 'Imported level 34',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.504379130604952,
'y': 0.4494455162937122
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.504060602739726,
'y': 0.663706467880541
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.5185716287756318,
'y': 0.11598558280439036
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5237238987492555,
'y': 0.26719525542414696
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 90,
'width': 0.322,
'x': 0.5578646651067812,
'y': 0.822972029013869
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.5580239290393942,
'y': 0.5567352560197396
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 270,
'width': 0.215,
'x': 0.4510528600357355,
'y': 0.876457706372841
},
]
},
{
'bg': '',
'name': 'Imported level 35',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.4689311082276865,
'y': 0.550903053943674
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 270,
'width': 0.429,
'x': 0.4701638994299329,
'y': 0.7642498850506254
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 45,
'width': 0.304,
'x': 0.5225760495192718,
'y': 0.3912011641283076
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.4841483509742195,
'y': 0.11076320650046798
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.4085506312430869,
'y': 0.26195864596273294
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.5984313243427211,
'y': 0.2994668475282907
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.5228477377690802,
'y': 0.2994668475282907
},
]
},
{
'bg': '',
'name': 'Imported level 36',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.5801178967072239,
'y': 0.2575823995575598
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.5801178967072239,
'y': 0.5587820932527866
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.5062928216625543,
'y': 0.8617402984769846
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5806993561643836,
'y': 0.7099633995575599
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.5045060438185995,
'y': 0.4087637058623329
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.46760756802518494,
'y': 0.7474716011231176
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.6188030074874501,
'y': 0.8236506374542669
},
]
},
{
'bg': '',
'name': 'Imported level 39',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 270,
'width': 0.429,
'x': 0.3989706585552626,
'y': 0.6143359515868289
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 90,
'width': 0.429,
'x': 0.39892905258231937,
'y': 0.8282783753084318
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 315,
'width': 0.304,
'x': 0.34651690249298045,
'y': 0.4546340617714626
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.40674169182336434,
'y': 0.21961151697438946
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.4908511851442184,
'y': 0.3475035859780482
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.33158562401089087,
'y': 0.3476628499106612
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 0,
'width': 0.215,
'x': 0.41025328988343385,
'y': 0.0918787119033438
},
]
},
{
'bg': '',
'name': 'Imported level 41',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.31727268339998316,
'y': 0.5903339898749256
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.6196352960095293,
'y': 0.5915251751042289
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 270,
'width': 0.304,
'x': 0.6196352960095293,
'y': 0.36471788275333955
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.4678583970901046,
'y': 0.28971575563685875
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.3166629576278398,
'y': 0.36471788275333955
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.2785591634476306,
'y': 0.2516119614566492
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 315,
'width': 0.215,
'x': 0.5815456349868118,
'y': 0.2516119614566492
},
]
},
{
'bg': '',
'name': 'Imported level 42',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.3995143365098274,
'y': 0.4468099189994045
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.6989556615332255,
'y': 0.44439913936867176
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.6239394012592531,
'y': 0.2937992925210585
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.24892876567684843,
'y': 0.5967998972177316
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.24833317306219685,
'y': 0.3711979232536373
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.2858412317706117,
'y': 0.48508607686453575
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.6638156972687824,
'y': 0.636094876627244
},
]
},
{
'bg': '',
'name': 'Imported level 45',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.2840290624521398,
'y': 0.29693865753424653
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.5852003469752403,
'y': 0.29693865753424653
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 270,
'width': 0.304,
'x': 0.5852003469752403,
'y': 0.5231503572704841
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.43461477614226157,
'y': 0.2969527906917383
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.28461052190929986,
'y': 0.5219591720411809
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.5477064214243171,
'y': 0.6368518711818261
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.24710232034374197,
'y': 0.6350650933378713
},
]
},
{
'bg': '',
'name': 'Imported level 46',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.19889755994214248,
'y': 0.3403220128477836
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 45,
'width': 0.429,
'x': 0.6537034727303668,
'y': 0.34091760546243516
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.4257049951501742,
'y': 0.339726420233132
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.19891183595677708,
'y': 0.6427270249298053
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.653689339572875,
'y': 0.5665337125840212
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.23582430205054034,
'y': 0.5296353796477495
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.6155855453926657,
'y': 0.6796396338807114
},
]
},
{
'bg': '',
'name': 'Imported level 47',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 315,
'width': 0.429,
'x': 0.3198028607164129,
'y': 0.5452058722879265
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.4709318037947758,
'y': 0.21236989772823966
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 270,
'width': 0.304,
'x': 0.6227893322555944,
'y': 0.6202221325618993
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.4710125761933123,
'y': 0.39402456598315316
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.5466102959244447,
'y': 0.5446244128307667
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.3579207880541139,
'y': 0.7333280538585892
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.5852954067046711,
'y': 0.7339236464732408
},
]
},
{
'bg': '',
'name': 'Imported level 49',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.7386076616183104,
'y': 0.44329757050965707
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 180,
'width': 0.429,
'x': 0.3125097348762019,
'y': 0.44329757050965707
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.5258564231260104,
'y': 0.41341968688845404
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.2375076077597209,
'y': 0.6261850585382456
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 135,
'width': 0.322,
'x': 0.8136097887347911,
'y': 0.54939615357781
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 225,
'width': 0.215,
'x': 0.20059499880881482,
'y': 0.5136890058708415
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 135,
'width': 0.215,
'x': 0.8511179903003486,
'y': 0.6636932601038034
},
]
},
{
'bg': '',
'name': 'Imported level 50',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.15798852667404065,
'y': 0.5899251818259166
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.7621464255934653,
'y': 0.5899251818259166
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 90,
'width': 0.304,
'x': 0.3085883735216539,
'y': 0.5166956993958991
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.6103695266740408,
'y': 0.4393112018208117
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': true,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.3829807748659918,
'y': 0.43990679443546327
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.49668228877733356,
'y': 0.4023985928699055
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.64847332085425,
'y': 0.5529984397175187
},
]
},
{
'bg': '',
'name': 'Imported level 52',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.23011831055900622,
'y': 0.5500260498596102
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.8719452960095293,
'y': 0.5524084203182166
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 45,
'width': 0.304,
'x': 0.7119248783289375,
'y': 0.39179226716583
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.3364937869480133,
'y': 0.4445230879775377
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.4975462687824384,
'y': 0.391633003233217
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.5504362106696163,
'y': 0.49904054377605733
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 90,
'width': 0.215,
'x': 0.818896090189739,
'y': 0.44571427320684087
},
]
},
{
'bg': '',
'name': 'Imported level 53',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.12875665200374367,
'y': 0.5200925202926914
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 0,
'width': 0.429,
'x': 0.7705837803114098,
'y': 0.520688112907343
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 0,
'width': 0.304,
'x': 0.44967014472900535,
'y': 0.3820107478941547
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 45,
'width': 0.152,
'x': 0.23572786386454517,
'y': 0.4133983731813154
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 0,
'width': 0.322,
'x': 0.6107226265634307,
'y': 0.3599128386794861
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.3421034831106951,
'y': 0.3597535747468732
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 180,
'width': 0.215,
'x': 0.6636125684506083,
'y': 0.4667246437505319
},
]
},
{
'bg': '',
'name': 'Imported level 54',
'colorMask': '#999',
'pieces': [
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.217,
'initY': 0.112,
'moduloRotation': 360,
'rotation': 135,
'width': 0.429,
'x': 0.22622124155534765,
'y': 0.6502168881987578
},
{
'img': 'tangram/p0.svg',
'flippable': 0,
'flipping': false,
'height': 0.214,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.442,
'initY': 0.113,
'moduloRotation': 360,
'rotation': 225,
'width': 0.429,
'x': 0.8327613680762359,
'y': 0.6520036660427124
},
{
'img': 'tangram/p1.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 180,
'initX': 0.61,
'initY': 0.08,
'moduloRotation': 360,
'rotation': 90,
'width': 0.304,
'x': 0.3780122736322641,
'y': 0.4263874160639836
},
{
'img': 'tangram/p2.svg',
'flippable': 0,
'flipping': false,
'height': 0.152,
'initFlipping': 0,
'initRotation': 0,
'initX': 0.911,
'initY': 0.081,
'moduloRotation': 90,
'rotation': 0,
'width': 0.152,
'x': 0.5297890296945461,
'y': 0.35019410371819965
},
{
'img': 'tangram/p3.svg',
'flippable': 1,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.083,
'initY': 0.178,
'moduloRotation': 180,
'rotation': 45,
'width': 0.322,
'x': 0.680984469156811,
'y': 0.4257918234493321
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 135,
'initX': 0.741,
'initY': 0.118,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.4161017917978387,
'y': 0.3126860450097848
},
{
'img': 'tangram/p4.svg',
'flippable': 0,
'flipping': false,
'height': 0.108,
'initFlipping': 0,
'initRotation': 45,
'initX': 0.946,
'initY': 0.205,
'moduloRotation': 360,
'rotation': 45,
'width': 0.215,
'x': 0.7190882633370205,
'y': 0.3126860450097848
},
]
},
]
diff --git a/src/activities/target/Arrow.qml b/src/activities/target/Arrow.qml
index 07a126d1f..5ea4c714c 100644
--- a/src/activities/target/Arrow.qml
+++ b/src/activities/target/Arrow.qml
@@ -1,66 +1,68 @@
/* GCompris - arrow.qml
*
* Copyright (C) 2014 Bruno coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "target.js" as Activity
Repeater {
id: arrowRepeater
model: 0
signal init(int nbArrow)
onInit: {
// Set to 0 to force a delete of previous arrows
model = 0
model = nbArrow
items.currentArrow = 0
}
Rectangle {
id: arrow
- width: 30 * ApplicationInfo.ratio
- height: 30 * ApplicationInfo.ratio
+ width: 15 * ApplicationInfo.ratio
+ height: 15 * ApplicationInfo.ratio
radius: width / 2
anchors.centerIn: parent
border.width: 1 * ApplicationInfo.ratio
- border.color: "black"
+ border.color: "#60000000"
opacity: 0
+ color: "#d6d6d6"
+ scale: 2
Behavior on scale {
id: scale
NumberAnimation {
id: anim
duration: 1000
easing.type: Easing.InOutQuad
onRunningChanged: {
if(!anim.running) {
// Reparent the arrow on the target
targetItem.attachArrow(arrow)
}
}
}
}
}
}
diff --git a/src/activities/target/Target.qml b/src/activities/target/Target.qml
index 52c04aee6..65610d57b 100644
--- a/src/activities/target/Target.qml
+++ b/src/activities/target/Target.qml
@@ -1,265 +1,265 @@
/* GCompris - target.qml
*
* Copyright (C) 2014 Bruno coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "target.js" as Activity
ActivityBase {
id: activity
onStart: focus = true
onStop: {}
pageComponent: Item {
id: background
anchors.fill: parent
signal start
signal stop
signal targetReached
Keys.onPressed: {
if(items.currentArrow != items.nbArrow)
return
if(event.key === Qt.Key_Backspace) {
backspace()
}
appendText(event.text)
}
Component.onCompleted: {
dialogActivityConfig.initialize()
activity.start.connect(start)
activity.stop.connect(stop)
}
// Add here the QML items you need to access in javascript
QtObject {
id: items
property Item main: activity.main
property alias background: background
property alias bar: bar
property alias bonus: bonus
property alias targetModel: targetItem.model
property var levels: activity.datasetLoader.data
property alias targetItem: targetItem
property alias userEntry: userEntry
property int currentArrow
property int nbArrow
property int currentSubLevel
property int numberOfSubLevel
property bool arrowFlying
onNbArrowChanged: {
arrowRepeater.init(nbArrow)
}
}
onStart: {
keyboard.populate();
Activity.start(items)
}
onStop: { Activity.stop() }
TargetItem {
id: targetItem
}
onTargetReached: {
items.arrowFlying = false
if(items.currentArrow == items.nbArrow) {
targetItem.stop()
targetItem.scoreText += " = "
userEntry.text = "?"
}
}
Arrow {
id: arrowRepeater
}
Image {
id: cross
anchors.centerIn: parent
source: Activity.url + "cross.svg"
opacity: items.currentArrow != items.nbArrow ? 1 : 0
sourceSize.width: 50 * ApplicationInfo.ratio
}
MouseArea {
id: mouseArea
anchors.fill: parent
enabled: items.currentArrow != items.nbArrow && !items.arrowFlying
onClicked: {
activity.audioEffects.play(Activity.url + 'arrow.wav')
items.arrowFlying = true
if(items.currentArrow != items.nbArrow) {
arrowRepeater.itemAt(items.currentArrow).opacity = 1
- arrowRepeater.itemAt(items.currentArrow++).scale = 0.5
+ arrowRepeater.itemAt(items.currentArrow++).scale = 1
}
}
}
GCText {
id: scoreItem
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
text: targetItem.scoreText
fontSize: 22
font.bold: true
style: Text.Outline
styleColor: "black"
color: "white"
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
}
function backspace() {
userEntry.text = userEntry.text.slice(0, -1)
if(userEntry.text.length === 0) {
userEntry.text = "?"
} else {
- if(targetItem.scoreTotal === userEntry.text)
+ if(targetItem.scoreTotal == userEntry.text)
bonus.good("flower")
}
}
function appendText(text) {
if(text === keyboard.backspace) {
backspace()
return
}
var number = parseInt(text)
if(isNaN(number))
return
if(userEntry.text === "?") {
userEntry.text = ""
}
if(userEntry.text.length > ('' + targetItem.scoreTotal).length) {
return
}
userEntry.text += text
if(targetItem.scoreTotal.toString() === userEntry.text)
bonus.good("flower")
}
GCText {
id: userEntry
anchors.top: scoreItem.bottom
width: parent.width
fontSize: 22
font.bold: true
style: Text.Outline
styleColor: "black"
color: "white"
wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignHCenter
}
VirtualKeyboard {
id: keyboard
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
hide: items.currentArrow == items.nbArrow ? false : true
function populate() {
layout = [
[
{ label: "0" },
{ label: "1" },
{ label: "2" },
{ label: "3" },
{ label: "4" },
{ label: "5" },
{ label: "6" },
{ label: "7" },
{ label: "8" },
{ label: "9" },
{ label: keyboard.backspace }
] ]
}
onKeypress: background.appendText(text)
onError: console.log("VirtualKeyboard error: " + msg);
}
DialogChooseLevel {
id: dialogActivityConfig
currentActivity: activity.activityInfo
onSaveData: {
levelFolder = dialogActivityConfig.chosenLevels
currentActivity.currentLevels = dialogActivityConfig.chosenLevels
ApplicationSettings.setCurrentLevels(currentActivity.name, dialogActivityConfig.chosenLevels)
background.start()
}
onClose: {
home()
}
onStartActivity: {
background.start()
}
}
DialogHelp {
id: dialogHelp
onClose: home()
}
Bar {
id: bar
anchors.bottom: keyboard.top
content: BarEnumContent { value: help | home | level | activityConfig }
onHelpClicked: {
displayDialog(dialogHelp)
}
onActivityConfigClicked: {
displayDialog(dialogActivityConfig)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
}
Score {
id: score
anchors.right: parent.right
anchors.top: parent.top
anchors.bottom: undefined
currentSubLevel: items.currentSubLevel + 1
numberOfSubLevels: items.numberOfSubLevel
}
Bonus {
id: bonus
Component.onCompleted: win.connect(Activity.nextSubLevel)
}
}
}
diff --git a/src/activities/target/TargetItem.qml b/src/activities/target/TargetItem.qml
index 5ed138a6e..51d087996 100644
--- a/src/activities/target/TargetItem.qml
+++ b/src/activities/target/TargetItem.qml
@@ -1,164 +1,165 @@
/* GCompris - TargetItem.qml
*
* Copyright (C) 2014 Bruno coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net> (GTK+ version)
* Bruno Coudoin <bruno.coudoin@gcompris.net> (Qt Quick port)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "../../core"
import "target.js" as Activity
Image {
id: targetItem
fillMode: Image.PreserveAspectCrop
source: Activity.url + "target_background.svg"
width: parent.width * zoom
height: parent.height * zoom
sourceSize.width: Math.max(parent.width, parent.height) * zoom
anchors.centerIn: parent
property int zoom: 2
property alias model: targetModel
property bool stopMe: false
property var scores: []
property string scoreText
property int scoreTotal
signal start
signal stop
signal attachArrow(Item arrow)
onStart: {
scores = []
scoreText = ""
scoreTotal = 0
stopMe = false
targetItem.anchors.horizontalCenterOffset = getRandomOffset(0)
targetItem.anchors.verticalCenterOffset = getRandomOffset(0)
}
onStop: {
stopMe = true
targetItem.anchors.horizontalCenterOffset = 0
targetItem.anchors.verticalCenterOffset = 0
}
// Avoid taking the same value or the animation won't restart
function getRandomOffset(oldValue) {
if(oldValue != 0 && Math.random() < 0.5)
return 0
var maxSize = targetModel.get(0).size * ApplicationInfo.ratio
do {
var newValue = Math.floor(Math.random() * maxSize) - maxSize / 2
} while(oldValue == newValue)
return newValue
}
onAttachArrow: {
arrow.anchors.centerIn = undefined
var coordArrow = parent.mapToItem(targetItem, arrow.x, arrow.y)
arrow.parent = targetItem
arrow.x = coordArrow.x
arrow.y = coordArrow.y
var arrowCenterX = arrow.x + arrow.width / 2
var arrowCenterY = arrow.y + arrow.height / 2
var centerX = targetItem.width / 2
var centerY = targetItem.height / 2
// Calc the arrow score
var dist = Math.sqrt(Math.pow(arrowCenterX - centerX, 2) +
Math.pow(arrowCenterY - centerY, 2))
dist *= zoom / ApplicationInfo.ratio
var score = 0
for(var i = targetModel.count - 1; i >= 0; --i) {
if(dist < targetModel.get(i).size) {
score = targetModel.get(i).score
break
}
}
scores.push(score)
scoreTotal += score
scoreText = scores.join(" + ")
parent.targetReached()
}
Behavior on anchors.horizontalCenterOffset {
id: horizontal
NumberAnimation {
id: anim1
duration: 3000
easing.type: Easing.InOutQuad
onRunningChanged: {
if(!anim1.running) {
var newValue = getRandomOffset(targetItem.anchors.horizontalCenterOffset)
if(!stopMe)
targetItem.anchors.horizontalCenterOffset = newValue
}
}
}
}
Behavior on anchors.verticalCenterOffset {
id: vertical
NumberAnimation {
id: anim2
duration: 3000
easing.type: Easing.InOutQuad
onRunningChanged: {
if(!anim2.running) {
var newValue = getRandomOffset(targetItem.anchors.verticalCenterOffset)
if(!stopMe)
targetItem.anchors.verticalCenterOffset = newValue
}
}
}
}
ListModel {
id: targetModel
}
Repeater {
id: repeater
model: targetModel
Rectangle {
anchors.centerIn: targetItem
width: size * ApplicationInfo.ratio
height: size * ApplicationInfo.ratio
color: model.color
radius: width / 2
border.width: 1 * ApplicationInfo.ratio
- border.color: "black"
+ border.color: "#40000000"
GCText {
anchors.horizontalCenter: parent.horizontalCenter
anchors.bottom: parent.bottom
width: ApplicationInfo.ratio * 30
horizontalAlignment: Text.AlignHCenter
font.pointSize: 20
minimumPointSize: 5
fontSizeMode: Text.Fit
text: score
+ color: "#A0000000"
}
}
}
}
diff --git a/src/activities/target/resource/README b/src/activities/target/resource/README
index 617825d9b..62e6fb9b6 100644
--- a/src/activities/target/resource/README
+++ b/src/activities/target/resource/README
@@ -1,13 +1,14 @@
arrow.wav: a composition of the 2 following sounds
- gezortenplotz https://www.freesound.org/people/gezortenplotz/sounds/20131/
31arrow shot.wav
This work is licensed under the Attribution License.
- Consul92: https://www.freesound.org/people/Consul92/sounds/171306/
Hit a screwdriver on wood
This work is licensed under the Creative Commons 0 License.
-License: Public domain
+Copyright: Timothée Giet, 2019
+License: CC-BY-SA 4.0
Files:
cross.svg
target_background.svg
diff --git a/src/activities/target/resource/cross.svg b/src/activities/target/resource/cross.svg
index afd61bf8f..4095239cd 100644
--- a/src/activities/target/resource/cross.svg
+++ b/src/activities/target/resource/cross.svg
@@ -1,71 +1,123 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="100.30129"
- height="100.00001"
+ width="15"
+ height="15"
id="svg2"
version="1.1"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="cross.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="86.068256"
- inkscape:cy="42.697355"
+ inkscape:zoom="44.8"
+ inkscape:cx="5.5325419"
+ inkscape:cy="6.8307809"
inkscape:document-units="px"
inkscape:current-layer="layer1"
- showgrid="false"
+ showgrid="true"
borderlayer="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- inkscape:window-width="1366"
- inkscape:window-height="713"
- inkscape:window-x="-2"
- inkscape:window-y="-3"
- inkscape:window-maximized="1" />
+ inkscape:window-width="1884"
+ inkscape:window-height="1051"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid814"
+ empspacing="4" />
+ </sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
+ <dc:title></dc:title>
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(-192.50737,-163.898)">
- <path
- style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 193.50737,213.898 98.30129,0"
- id="path2985"
- inkscape:connector-curvature="0" />
- <path
- style="fill:none;stroke:#000000;stroke-width:1.99212527;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m 241.97541,164.89406 1.36522,98.00788"
- id="path2987"
- inkscape:connector-curvature="0" />
+ transform="translate(-192.50737,-264.89801)">
+ <rect
+ style="opacity:1;vector-effect:none;fill:#1f1f1f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect816"
+ width="1"
+ height="15"
+ x="199.50737"
+ y="264.89801"
+ ry="0.5" />
+ <rect
+ style="opacity:1;vector-effect:none;fill:#1f1f1f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect818"
+ width="15"
+ height="1"
+ x="192.50737"
+ y="271.89801"
+ ry="0.5" />
+ <rect
+ style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.68898648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect816-3"
+ width="0.5"
+ height="14.241072"
+ x="199.75737"
+ y="265.27747"
+ ry="0.47470239" />
+ <rect
+ style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:0.68898648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect816-3-6"
+ width="0.5"
+ height="14.241072"
+ x="-272.64801"
+ y="192.88684"
+ ry="0.47470239"
+ transform="rotate(-90)" />
</g>
</svg>
diff --git a/src/activities/target/resource/target_background.svg b/src/activities/target/resource/target_background.svg
index 3b77859e4..639722db0 100644
--- a/src/activities/target/resource/target_background.svg
+++ b/src/activities/target/resource/target_background.svg
@@ -1,676 +1,440 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2440"
sodipodi:version="0.32"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
width="800"
height="520"
version="1.0"
sodipodi:docname="target_background.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<sodipodi:namedview
- inkscape:window-height="981"
- inkscape:window-width="1280"
+ inkscape:window-height="1051"
+ inkscape:window-width="1884"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
gridtolerance="10.0"
objecttolerance="10.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
showgrid="false"
showguides="true"
inkscape:guide-bbox="true"
inkscape:zoom="1.0098262"
- inkscape:cx="497.67317"
- inkscape:cy="155.99922"
+ inkscape:cx="243.05834"
+ inkscape:cy="172.06143"
inkscape:window-x="0"
inkscape:window-y="0"
- inkscape:current-layer="svg2440"
+ inkscape:current-layer="layer3"
borderlayer="true"
inkscape:showpageshadow="false"
- inkscape:window-maximized="0" />
+ inkscape:window-maximized="1"
+ inkscape:snap-global="false" />
<metadata
id="metadata2445">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
+ <dc:date>2019</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Timothée Giet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
</cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+ </cc:License>
</rdf:RDF>
</metadata>
<defs
- id="defs2443" />
- <path
- style="fill:#5599ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M -14.704751,-9.3710407 L -17.505656,386.25679 L 515.36652,365.95023 L 560.88122,365.95023 L 620.40045,369.45136 L 709.32919,382.75566 L 812.26244,397.46041 L 809.46154,-16.373303 L -14.704751,-9.3710407 z"
- id="path7666" />
- <path
- style="fill:#ffcc00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M -18.906109,389.05769 L 502.06222,365.95023 L 550.37783,363.84955 L 597.29299,367.35068 L 677.819,377.15385 L 811.56222,396.76018 L 807.36086,543.80769 L -18.906109,552.91063 L -18.906109,389.05769 z"
- id="path7664" />
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M -12.604073,382.75565 C -9.1029415,382.75565 544.77602,360.34841 544.77602,360.34841 C 544.77602,360.34841 810.86199,382.75565 813.6629,396.76018 C 816.4638,410.7647 815.06335,419.86764 815.06335,419.86764 C 815.06335,419.86764 847.87746,403.2015 805.26018,400.96154 C 761.98764,398.68714 661.61399,368.51615 539.87444,368.75113 C 417.43467,368.98746 -9.1029415,386.95701 -9.1029415,393.25905 C -9.1029415,399.56108 -13.304299,383.45588 -12.604073,382.75565 z"
- id="path7662"
- sodipodi:nodetypes="ccsczzsc" />
+ id="defs2443">
+ <linearGradient
+ gradientTransform="translate(0,-532.36216)"
+ inkscape:collect="always"
+ xlink:href="#linearGradient10146"
+ id="linearGradient10152"
+ x1="550.53314"
+ y1="503.84933"
+ x2="542.45184"
+ y2="831.13879"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient10146">
+ <stop
+ style="stop-color:#3cc1f1;stop-opacity:1"
+ offset="0"
+ id="stop10148" />
+ <stop
+ style="stop-color:#85d8f6;stop-opacity:1"
+ offset="1"
+ id="stop10150" />
+ </linearGradient>
+ </defs>
<g
- id="g7874"
- transform="matrix(0.6917986,0,0,0.6917986,214.27538,70.153664)">
- <path
- id="path7774"
- d="m 559.41121,313.84079 c 7.48488,0.15254 13.41008,7.35432 17.93231,12.70751 10.73341,-9.03659 28.00812,0.6239 28.07639,16.32898 3.56344,20.78125 -0.9743,42.08274 1.49666,62.98787 -0.0101,12.98675 -5.38959,29.07956 -17.79372,31.07358 -2.06899,1.41082 -7.65358,-1.63851 -7.49956,1.87005 0.37066,7.8677 -0.55129,26.66792 -4.45543,33.39249 -3.90413,6.72457 -10.79047,1.37348 -18.20011,1.72827 -8.54923,0.59418 -15.14585,5.59367 -20.05087,-2.08892 -4.90502,-7.6826 -5.31755,-15.44319 -2.9519,-24.78759 -0.41776,-5.88926 -1.82334,-25.95661 -3.41065,-31.00248 -12.43838,0.0644 -25.86015,-11.15211 -25.08623,-26.76379 -1.5053,-20.22198 -2.43504,-41.383 2.74707,-60.92773 5.76292,-11.0329 20.97638,-14.14006 28.79701,-4.52684 4.94217,-6.90571 12.68656,-10.70176 20.39903,-9.9914 z"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:nodetypes="ccccccscscccccc"
- inkscape:connector-curvature="0" />
- <path
- id="path7776"
- d="m 558.45088,321.60431 c 8.02721,0 14.49004,7.17132 14.49004,16.0785 l 0,64.85223 3.95911,-1.02429 3.61035,-55.41252 c 0,-8.90717 6.20191,-15.37828 11.28581,-15.37828 5.08389,0 9.15478,7.17133 9.15478,16.07851 l 0,61.08488 c 0,1.89759 -0.1738,3.6945 -0.51532,5.38192 -0.0719,0.91513 -0.30632,1.78982 -0.69723,2.62369 -1.58107,4.82003 -4.52895,12.97447 -7.94223,12.97447 l -16.75459,3.12497 -3.235,28.08267 c 0,8.90718 -5.3285,1.93428 -13.35572,1.93428 -8.02719,0 -15.62437,9.33027 -15.62437,0.42309 l -2.3668,-51.16661 -9.53384,-5.60181 c -7.80054,0 -16.20956,-6.40289 -16.56042,-11.82177 -0.92308,-2.46608 -1.48538,-19.38328 -1.48538,-22.51472 l 0.70023,-27.80631 c 0,-8.90718 5.71912,-18.17919 11.07059,-18.17919 5.35147,0 10.37036,3.67019 10.37036,12.57738 l 3.14963,43.15921 5.78996,0 0,-43.3918 c 0,-8.90717 6.46285,-16.0785 14.49004,-16.0785 z m -34.77005,12.84935 c -1.33787,0 -2.15257,7.15674 -1.81882,16.04487 l 0.72752,19.37495 c 0.33375,8.88812 1.69354,16.04486 3.0314,16.04486 1.33787,2e-5 2.15258,-7.15674 1.81883,-16.04486 l -0.72753,-19.37495 c -0.33375,-8.88812 -1.69352,-16.04487 -3.0314,-16.04487 z m 42.01508,2.15278 c -1.33785,0 -2.3948,7.17133 -2.3948,16.0785 l 0,82.51168 c 0,8.90717 1.05694,16.0785 2.3948,16.0785 1.33788,0 2.42511,-7.17133 2.42511,-16.0785 l 0,-82.51168 c 0,-8.90718 -1.08724,-16.0785 -2.42511,-16.0785 z m -14.49005,0 c -1.07029,0 -1.94008,7.17133 -1.94008,16.0785 l 0,82.51168 c 0,8.90717 0.8698,16.0785 1.94008,16.0785 1.07029,0 1.94009,-7.17133 1.94009,-16.0785 l 0,-82.51168 c 0,-8.90717 -0.8698,-16.0785 -1.94009,-16.0785 z m 43.89453,1.8164 c -1.33085,-0.13594 -3.1472,6.86216 -4.06205,15.7085 l -4.30458,41.60902 c -0.91486,8.84633 -0.57301,16.07715 0.75784,16.21306 1.33086,0.13592 3.14721,-6.86216 4.06206,-15.7085 l 4.30458,-41.60903 c 0.91486,-8.84632 0.573,-16.07714 -0.75785,-16.21305 z"
- style="fill:#00aa00;fill-opacity:1;fill-rule:evenodd;stroke:none"
- sodipodi:nodetypes="cccccscccccccsccccccsccccccccsccccccsccccccsccccccsccc"
- inkscape:connector-curvature="0" />
- <rect
- transform="matrix(0,1,0.992873,-0.1191773,0,0)"
- ry="21.406212"
- rx="21.591507"
- y="498.37695"
- x="403.26266"
- height="17.291216"
- width="5.1518035"
- id="rect7778"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(0,1,0.9956729,-0.09292719,0,0)"
- ry="21.433712"
- rx="21.591507"
- y="495.64496"
- x="406.41211"
- height="22.175652"
- width="5.1518035"
- id="rect7780"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(0,1,0.992873,-0.1191773,0,0)"
- ry="21.406212"
- rx="21.591507"
- y="499.41449"
- x="440.47931"
- height="17.291216"
- width="5.1518035"
- id="rect7782"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(0.403398,0.9150246,0.6482238,-0.7614499,0,0)"
- ry="20.83087"
- rx="21.180977"
- y="325.54343"
- x="713.30676"
- height="20.920475"
- width="4.6958685"
- id="rect7784"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+ inkscape:groupmode="layer"
+ id="layer3"
+ inkscape:label="Layer 3"
+ style="display:inline">
<rect
- transform="matrix(0.4932249,-0.8699018,0.7383687,0.6743972,0,0)"
- ry="21.492426"
- rx="21.6413"
- y="607.14215"
- x="99.257553"
- height="23.620932"
- width="4.9394484"
- id="rect7786"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(0,1,-0.9919929,-0.1262936,0,0)"
- ry="21.385788"
- rx="21.591507"
- y="-623.45099"
- x="277.49384"
- height="16.31691"
- width="5.1518035"
- id="rect7788"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(0,1,-0.9919929,-0.1262935,0,0)"
- ry="21.385788"
- rx="21.591507"
- y="-620.51385"
- x="294.35062"
- height="16.31691"
- width="5.1518035"
- id="rect7790"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(0,1,-0.9919929,-0.1262935,0,0)"
- ry="21.385788"
- rx="21.591507"
- y="-622.47192"
- x="314.71054"
- height="16.31691"
- width="5.1518035"
- id="rect7792"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(-0.3838156,0.9234098,-0.6259409,-0.7798705,0,0)"
- ry="20.500906"
- rx="20.991987"
- y="-829.53448"
- x="-248.81358"
- height="20.426329"
- width="4.6532269"
- id="rect7794"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <rect
- transform="matrix(-0.3838156,-0.9234098,-0.6259409,0.7798705,0,0)"
- ry="20.500902"
- rx="20.991983"
- y="-498.21939"
- x="-784.0741"
- height="20.426329"
- width="4.6532269"
- id="rect7796"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" />
- <g
- transform="matrix(0,-1.0347082,-0.8869146,0,309.52696,488.6331)"
- id="g7798">
- <rect
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="rect7800"
- width="4.9789915"
- height="19.45916"
- x="-317.30539"
- y="-178.42404"
- rx="20.867243"
- ry="24.090084"
- transform="matrix(0,1,-0.9947487,-0.1023475,0,0)" />
- <rect
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="rect7802"
- width="4.9789915"
- height="24.974489"
- x="-297.42981"
- y="-179.55255"
- rx="20.867243"
- ry="24.138906"
- transform="matrix(0,1,-0.9968153,-0.07974522,0,0)" />
- <rect
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="rect7804"
- width="4.9789915"
- height="19.45916"
- x="-281.33713"
- y="-177.25644"
- rx="20.867243"
- ry="24.090084"
- transform="matrix(0,1,-0.9947487,-0.1023475,0,0)" />
- <rect
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="rect7806"
- width="4.6697679"
- height="21.698259"
- x="-306.9913"
- y="-46.300934"
- rx="21.063253"
- ry="21.605331"
- transform="matrix(-0.4573751,0.8892739,-0.7046765,-0.7095288,0,0)" />
- <rect
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="rect7808"
- width="4.9789915"
- height="24.974489"
- x="143.99376"
- y="-322.82776"
- rx="21.814545"
- ry="22.72402"
- transform="matrix(-0.5516965,-0.8340449,-0.7873936,0.6164506,0,0)" />
- </g>
- </g>
- <g
- id="g3355"
- transform="matrix(0.54348326,0,0,0.54348326,261.33696,115.44244)">
- <path
- sodipodi:nodetypes="ccccccccc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 49.450563,260.0872 -0.406873,143.21887 2.441229,107.00728 -5.28933,9.95036 -30.106619,0.0133 -2.849997,-68.14628 2.848107,-187.56789 3.661845,-6.50995 29.701638,2.03436 z"
- id="path3333"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccccc"
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 46.304995,508.91002 c -0.929808,-29.69829 -1.424321,-59.46162 -2.121524,-89.18553 0.111434,-39.56315 0.222863,-79.12629 0.334297,-118.68943 -7.41748,-0.50297 -14.834956,-1.00593 -22.252436,-1.5089 -1.934363,2.58917 -2.860388,5.75664 -2.34928,8.96529 -0.689314,52.12165 -1.805144,104.24477 -2.182438,156.36617 0.841584,17.33568 1.683167,34.67135 2.52475,52.00702 7.490033,-0.8156 15.987229,1.95481 23.35538,0.92522 1.27565,-1.71901 2.967465,-6.40101 2.691251,-8.87984 z"
- id="path3335"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g3351"
- transform="matrix(-0.54348326,0,0,0.54348326,767.81581,116.20356)">
- <path
- sodipodi:nodetypes="ccccccccc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 483.39496,264.9227 -0.40687,143.21886 2.44123,107.00728 -4.88435,5.09064 -30.30911,0.21574 -3.05249,-63.48905 2.84811,-187.56788 3.66185,-6.50995 29.70163,2.03436 z"
- id="path3343"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccccc"
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 481.71877,510.18965 c -1.00157,-31.99012 -1.53424,-64.0503 -2.28525,-96.06802 0.12003,-42.61625 0.24007,-85.2325 0.3601,-127.84876 -7.98989,-0.54177 -15.97978,-1.08354 -23.96967,-1.62532 -2.08364,2.78897 -3.08113,6.20088 -2.53058,9.65714 -0.7425,56.1439 -1.94444,112.28939 -2.35085,168.43302 0.90653,18.67347 1.20558,36.13203 2.11212,54.80549 8.06804,-0.87854 16.95598,-0.16925 24.89273,-1.27829 1.37409,-1.85167 4.06893,-3.40513 3.7714,-6.07526 z"
- id="path3345"
- inkscape:connector-curvature="0" />
- </g>
- <path
- sodipodi:nodetypes="csssssssssssssssc"
- id="path4674"
- d="M -103.38172,381.68222 C -103.38172,386.36883 -103.12211,392.20219 -104.87684,396.26477 C -106.63156,400.32735 -109.58059,404.07907 -112.71743,407.15253 C -115.85427,410.226 -120.59503,411.19404 -124.74137,412.91332 C -128.88772,414.63259 -134.16748,417.17054 -138.95073,417.17054 C -143.73397,417.17054 -146.99519,414.33988 -151.14154,412.62061 C -155.28788,410.90133 -157.02636,408.42804 -160.1632,405.35457 C -163.30004,402.28111 -168.15698,398.90062 -169.9117,394.83804 C -171.66643,390.77546 -174.37416,384.79798 -174.37416,380.11137 C -174.37416,375.42475 -172.65418,371.79242 -170.89945,367.72983 C -169.14473,363.66725 -165.68654,360.61959 -162.5497,357.54612 C -159.41286,354.47265 -153.96419,352.39468 -149.81785,350.6754 C -145.6715,348.95613 -141.45224,346.94031 -136.669,346.94031 C -131.88575,346.94031 -129.27809,349.32944 -125.13174,351.04871 C -120.9854,352.76799 -116.9128,354.88302 -113.77596,357.95649 C -110.63912,361.02996 -107.16023,366.16179 -105.40551,370.22437 C -103.65078,374.28696 -102.91543,376.99345 -102.91543,381.68007 C -102.91543,381.68007 -103.67997,384.58009 -103.67997,384.58009"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:8.69999981;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:8.69999981, 26.09999943;stroke-dashoffset:0;stroke-opacity:1" />
- <g
- id="g4761"
- transform="matrix(0.54348326,0,0,0.54348326,338.97145,-153.2338)">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 333.65809,834.12762 c 0,0 -27.38098,0.57083 -27.38098,0.57083 0,0 -29.17269,1.60879 -29.17269,1.60879 0,0 -29.03528,2.48149 -29.03528,2.48149 0,0 -24.78026,-1.723 -24.78026,-1.723 0,0 -25.38498,4.86188 -25.38498,4.86188 0,0 -28.66223,-1.30328 -28.66223,-1.30328 0,0 -28.04159,2.85566 -28.04159,2.85566 0,0 -26.64495,0.64445 -26.64495,0.64445 0,0 -28.953214,-0.0884 -28.953214,-0.0884 0,0 -29.495406,1.93683 -29.495406,1.93683 0,0 -30.23658,-0.14967 -30.23658,-0.14967 0,0 -29.30965,1.49453 -29.30965,1.49453 0,0 -30.40671,-1.36643 -30.40671,-1.36643 0,0 -29.30393,1.80597 -29.30393,1.80597 0,0 -27.37448,-1.32107 -27.37448,-1.32107 0,0 -30.95836,0.52484 -30.95836,0.52484 0,0 -7.75092,6.31337 -7.75092,6.31337 0,0 -4.99593,56.54649 -4.99593,56.54649 0,0 30.8475,1.68785 30.8475,1.68785 0,0 32.52992,-2.3976 32.52992,-2.3976 0,0 28.45619,2.77637 28.45619,2.77637 0,0 30.75669,0.29132 30.75669,0.29132 0,0 40.0427,0.19061 40.0427,0.19061 0,0 43.8243,-5.72154 43.8243,-5.72154 0,0 41.75817,0.26126 41.75817,0.26126 0,0 39.86393,-4.75897 39.86393,-4.75897 0,0 44.70331,-3.43692 44.70331,-3.43692 0,0 44.1565,-0.0259 44.1565,-0.0259 0,0 42.09114,-2.7179 42.09114,-2.7179 0,0 41.57467,-2.19927 41.57467,-2.19927 0,0 11.85509,-6.74046 11.85509,-6.74046 0,0 -5.50517,-55.39926 -5.50517,-55.39926 0,0 -0.15096,0.19355 -0.15096,0.19355"
- id="path4487"
- sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#784421;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m -112.39124,849.70653 c 7.92275,-0.0487 15.17699,0.3507 23.75891,0.24816 8.58191,-0.10254 17.64431,0.19159 26.69722,0.0484 9.05291,-0.14321 17.96067,-0.31687 27.2964,-0.48761 9.33573,-0.17073 21.21794,3.60095 30.64831,3.41586 9.43038,-0.18509 21.28694,-1.7255 30.6238,-1.91179 9.33685,-0.18629 15.414,-1.13562 24.46916,-1.30995 9.05516,-0.17434 17.39643,-0.42225 25.98172,-0.57147 8.5853,-0.14922 17.75402,0.3399 25.68128,0.22895 10.54097,-0.42464 18.16678,-1.63837 28.05151,-2.03566 9.88472,-0.3973 18.10753,0.42495 27.5235,0.0472 9.41598,-0.37777 20.31328,-3.63122 29.448,-3.99726 9.13472,-0.36605 18.32967,-0.19942 27.37064,-0.56156 9.04097,-0.36214 19.47376,0.2787 28.60848,-0.0874 9.13472,-0.36605 16.16968,-2.61356 25.58565,-2.99132 9.41597,-0.37777 19.5766,-1.54598 29.46132,-1.94328 9.88473,-0.39729 18.52784,3.30325 29.06881,2.87861 1.66454,15.77166 4.70723,28.60615 6.37177,44.37781 -5.36483,4.33025 -11.62142,6.76969 -18.50213,5.93642 -13.88157,0.70399 -30.53832,1.96893 -44.4191,2.69649 -13.88077,0.72755 -24.51056,-1.58647 -38.39087,-0.84505 -13.88031,0.74142 -29.62739,3.7794 -43.50757,4.52498 -13.88019,0.74558 -25.71004,-0.65733 -39.59044,0.0827 -13.8804,0.74003 -28.1645,2.42732 -42.04545,3.15211 -13.88095,0.7248 -27.88786,3.44723 -41.7697,4.14708 -13.88183,0.69985 -26.61342,2.35993 -40.49647,3.02512 -13.88306,0.6652 -29.40181,-1.02591 -43.28643,-0.40506 -18.51081,-0.20477 -36.41882,0.0349 -54.92964,-0.16984 -18.51082,-0.20478 -36.3319,0.31284 -54.84271,0.10807 1.14046,-16.03163 1.05624,-36.05058 2.66257,-51.83948 3.56254,-2.85658 5.26761,-3.68874 10.57379,-3.2979 0,0 0.59856,-3.61055 0.59856,-3.61055"
- id="path4489"
- sodipodi:nodetypes="cssssssscssssssscccssssssscscccc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g4875"
- transform="matrix(-0.54348326,0,0,-0.54348326,766.69819,446.13778)">
- <path
- sodipodi:nodetypes="ccccccccc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 483.39496,264.9227 -0.40687,143.21886 2.44123,107.00728 -4.88435,5.09064 -30.30911,0.21574 -3.05249,-63.48905 2.84811,-187.56788 3.66185,-6.50995 29.70163,2.03436 z"
- id="path4877"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccccc"
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 481.71877,510.18965 c -1.00157,-31.99012 -1.53424,-64.0503 -2.28525,-96.06802 0.12003,-42.61625 0.24007,-85.2325 0.3601,-127.84876 -7.98989,-0.54177 -15.97978,-1.08354 -23.96967,-1.62532 -2.08364,2.78897 -3.08113,6.20088 -2.53058,9.65714 -0.7425,56.1439 -1.94444,112.28939 -2.35085,168.43302 0.90653,18.67347 1.20558,36.13203 2.11212,54.80549 8.06804,-0.87854 16.95598,-0.16925 24.89273,-1.27829 1.37409,-1.85167 4.06893,-3.40513 3.7714,-6.07526 z"
- id="path4879"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,-0.54348326,308.89233,629.31101)"
- id="g4211">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 359.65277,577.01577 c 0,0 -59.16286,4.26162 -59.16286,4.26162 0,0 -58.60697,3.37465 -58.60697,3.37465 0,0 -56.74704,0.77941 -56.74704,0.77941 0,0 -61.4929,0.34102 -61.4929,0.34102 0,0 -48.343698,0.74654 -48.343698,0.74654 0,0 -46.245335,0.34978 -46.245335,0.34978 0,0 -47.363307,1.67834 -47.363307,1.67834 0,0 -50.516342,-0.61593 -50.516342,-0.61593 0,0 -10.089035,10.78371 -10.089035,10.78371 0,0 -4.08314,52.84346 -4.08314,52.84346 0,0 61.701955,-0.64928 61.701955,-0.64928 0,0 59.493133,1.79019 59.493133,1.79019 0,0 42.164503,0.0234 42.164503,0.0234 0,0 43.474376,-2.31088 43.474376,-2.31088 0,0 42.52013,-1.78103 42.52013,-1.78103 0,0 43.2598,-2.5413 43.2598,-2.5413 0,0 41.43073,0.35015 41.43073,0.35015 0,0 41.27137,-3.20444 41.27137,-3.20444 0,0 43.71222,-2.58657 43.71222,-2.58657 0,0 44.50423,-1.39193 44.50423,-1.39193 0,0 9.15344,-7.17522 9.15344,-7.17522 0,0 -3.67826,-27.80415 -3.67826,-27.80415 -0.4716,0.0257 -0.86706,-1.05595 -1.34487,-1.05595 -13.57727,0 -24.12816,-10.2924 -25.65143,-23.82928 0,0 -0.58432,0.23351 -0.58432,0.23351 m -389.630117,22.46412 c 9.54089,0 18.595446,8.90567 18.595446,19.29843 0,10.39276 -7.91331,18.68118 -17.4542,18.68118 -9.540902,-10e-6 -14.434888,-10.07194 -14.434888,-20.4647 -1e-6,-10.39276 2.338052,-17.49456 11.878941,-17.49456 0,0 -0.221121,1.82276 -0.221121,1.82276"
- id="path4213"
- sodipodi:nodetypes="cccccccccccccccccccccccscccssccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 355.95139,583.83974 c -9.52227,0.29252 -17.41211,-1.23315 -26.93427,-0.94027 -9.52215,0.29287 -19.13336,1.9529 -28.65544,2.24602 -9.52208,0.29312 -19.75207,-0.5367 -29.2741,-0.24345 -9.52204,0.29325 -18.19891,2.9821 -27.72095,3.27537 -9.52203,0.29326 -17.40006,-1.37654 -26.92213,-1.08336 -9.52207,0.29317 -20.79548,0.10544 -30.31763,0.39841 -9.52214,0.29297 -18.66643,0.55951 -28.18869,0.85216 -9.52225,0.29265 -19.6453,-0.26749 -29.1677,0.0247 -7.92796,0.035 -16.44977,1.08621 -24.37904,1.13222 -7.929276,0.046 -11.804225,2.41944 -19.734265,2.47113 -7.930029,0.0517 -19.491153,-0.90606 -27.421386,-0.85408 -7.930232,0.052 -15.737901,0.031 -23.667774,0.0779 -7.929874,0.0469 -17.527057,0.25525 -25.4560141,0.29169 -7.92895695,0.0364 -14.1359957,-1.9961 -22.0634769,-1.9755 -7.927483,0.0206 -15.295263,1.69114 -23.220712,1.69051 -7.925449,-6.3e-4 -15.758998,-0.15499 -23.681855,-0.18222 -2.651095,-0.22084 -4.732824,0.53028 -6.582268,2.17802 -1.849445,1.64773 -4.968679,3.88402 -6.763554,5.29518 -0.8788,7.88639 -1.659058,15.77568 -2.176037,23.85628 -0.516979,8.08059 -0.295827,16.7772 -0.942862,24.78718 9.254,0.19109 16.125556,1.25905 25.380915,1.44903 9.255358,0.18998 22.680187,-0.43424 31.935999,-0.24463 9.255812,0.18961 17.228779,-0.0117 26.484139,0.17827 9.25536,0.18998 18.469895,-0.66308 27.723897,-0.47199 6.944966,-0.24387 13.129662,-0.18267 20.074191,-0.43817 6.944528,-0.2555 14.314069,-0.28096 21.258209,-0.5469 6.944138,-0.26593 14.825537,-0.24453 21.769337,-0.51969 6.943797,-0.27516 10.106247,-0.21128 17.049757,-0.49446 6.94351,-0.28318 16.19685,-0.76795 23.14011,-1.05795 6.94327,-0.29 12.60244,-0.37702 19.54552,-0.67263 6.94308,-0.29561 15.35326,0.0399 22.29619,-0.26014 6.94293,-0.30001 12.90546,-0.93464 19.8483,-1.23786 6.94284,-0.30321 15.78707,-0.76752 22.72986,-1.07273 6.9428,-0.30522 13.48906,-2.83959 20.43185,-3.14559 6.9428,-0.30601 13.55501,1.11578 20.49786,0.81019 6.94285,-0.30559 14.41304,-0.0242 21.35599,-0.32819 6.94295,-0.30397 13.31437,-1.37681 20.25746,-1.67796 6.9431,-0.30115 12.45415,0.69137 19.39745,0.39424 6.9433,-0.29712 15.50282,-1.30032 22.44637,-1.59221 6.94354,-0.29189 13.56888,-0.3274 20.51272,-0.61285 3.43619,0.44959 6.93735,0.41434 10.15254,-0.54605 3.21519,-0.96038 3.9353,-2.48137 6.63835,-4.62069 -0.36982,-3.85802 1.93621,-8.96676 1.56713,-12.82637 -0.36909,-3.85961 -0.89017,-6.22006 -1.26275,-10.07984 -0.10838,0.003 1.26048,-3.31937 1.15076,-3.31223 -0.10971,0.007 -2.16349,1.36535 -2.27249,1.36535 -6.69153,0 -11.56643,-1.59073 -16.22662,-5.80865 -4.66019,-4.21792 -8.73086,-11.16501 -9.61731,-17.79334 0,0 -0.64076,2.49275 -0.64076,2.49275 m -385.786035,14.07762 c 5.683935,0 10.543788,2.62234 14.271241,6.68386 3.727453,4.06152 8.7782096,10.52285 8.7782116,16.71428 2e-6,6.19143 -3.408329,10.22137 -7.1357836,14.28288 -3.727455,4.06152 -10.417729,7.10524 -16.101664,7.10524 -5.683941,0 -10.060918,-4.92939 -13.78837,-8.9909 -3.727453,-4.06152 -7.289887,-7.45218 -7.289887,-13.64361 0,-6.19143 2.139509,-11.7577 5.866963,-15.81922 3.727454,-4.06152 8.934504,-8.37472 14.618438,-8.37472"
- id="path4215"
- sodipodi:nodetypes="cssssssscssssssscscscssscssssssssssssssscscscssscccsssssscc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,349.24513,-62.819624)"
- id="g4479">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m -149.56147,561.76706 c 0,0 27.38098,0.57083 27.38098,0.57083 0,0 29.172695,1.60879 29.172695,1.60879 0,0 29.035272,2.48149 29.035272,2.48149 0,0 24.780268,-1.723 24.780268,-1.723 0,0 25.384979,4.86188 25.384979,4.86188 0,0 28.662223,-1.30328 28.662223,-1.30328 0,0 28.041593,2.85566 28.041593,2.85566 0,0 26.644948,0.64445 26.644948,0.64445 0,0 28.953216,-0.0884 28.953216,-0.0884 0,0 29.495406,1.93683 29.495406,1.93683 0,0 30.23658,-0.14967 30.23658,-0.14967 0,0 29.30965,1.49453 29.30965,1.49453 0,0 30.40671,-1.36643 30.40671,-1.36643 0,0 29.30393,1.80597 29.30393,1.80597 0,0 27.37448,-1.32107 27.37448,-1.32107 0,0 30.95836,0.52484 30.95836,0.52484 0,0 7.75092,6.31337 7.75092,6.31337 0,0 4.99593,56.54649 4.99593,56.54649 0,0 -30.8475,1.68785 -30.8475,1.68785 0,0 -32.52992,-2.3976 -32.52992,-2.3976 0,0 -28.45619,2.77637 -28.45619,2.77637 0,0 -30.75669,0.29132 -30.75669,0.29132 0,0 -40.0427,0.19061 -40.0427,0.19061 0,0 -43.8243,-5.72154 -43.8243,-5.72154 0,0 -41.758171,0.26126 -41.758171,0.26126 0,0 -39.863931,-4.75897 -39.863931,-4.75897 0,0 -44.703311,-3.43692 -44.703311,-3.43692 0,0 -44.156498,-0.0259 -44.156498,-0.0259 0,0 -42.091139,-2.7179 -42.091139,-2.7179 0,0 -41.57467,-2.19927 -41.57467,-2.19927 0,0 -11.85509,-6.74046 -11.85509,-6.74046 0,0 5.50517,-55.39926 5.50517,-55.39926 0,0 0.15096,0.19355 0.15096,0.19355"
- id="path4481"
- sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 296.48786,577.34597 c -7.92275,-0.0487 -15.17699,0.3507 -23.75891,0.24816 -8.58191,-0.10254 -17.64431,0.19159 -26.69722,0.0484 -9.05291,-0.14321 -17.96067,-0.31687 -27.2964,-0.48761 -9.33573,-0.17073 -21.21794,3.60095 -30.64831,3.41586 -9.43038,-0.18509 -21.28694,-1.7255 -30.6238,-1.91179 -9.33685,-0.18629 -15.414,-1.13562 -24.46916,-1.30995 -9.05516,-0.17434 -17.39643,-0.42225 -25.98172,-0.57147 -8.5853,-0.14922 -17.75402,0.3399 -25.68128,0.22895 -10.54097,-0.42464 -18.16678,-1.63837 -28.05151,-2.03566 -9.88472,-0.3973 -18.10753,0.42495 -27.5235,0.0472 -9.41598,-0.37777 -20.31328,-3.63122 -29.448,-3.99726 -9.13472,-0.36605 -18.32967,-0.19942 -27.37064,-0.56156 -9.040974,-0.36214 -19.473755,0.2787 -28.608477,-0.0874 -9.134722,-0.36605 -16.169679,-2.61356 -25.585651,-2.99132 -9.415972,-0.37777 -19.576602,-1.54598 -29.461322,-1.94328 -9.88473,-0.39729 -18.52784,3.30325 -29.06881,2.87861 -1.66454,15.77166 -4.70723,28.60615 -6.37177,44.37781 5.36483,4.33025 11.62142,6.76969 18.50213,5.93642 13.88157,0.70399 30.53832,1.96893 44.419096,2.69649 13.880772,0.72755 24.510565,-1.58647 38.390876,-0.84505 13.880311,0.74142 29.627388,3.7794 43.507568,4.52498 13.88019,0.74558 25.71004,-0.65733 39.59044,0.0827 13.8804,0.74003 28.1645,2.42732 42.04545,3.15211 13.88095,0.7248 27.88786,3.44723 41.7697,4.14708 13.88183,0.69985 26.61342,2.35993 40.49647,3.02512 13.88306,0.6652 29.40181,-1.02591 43.28643,-0.40506 18.51081,-0.20477 36.41882,0.0349 54.92964,-0.16984 18.51082,-0.20478 36.3319,0.31284 54.84271,0.10807 -1.14046,-16.03163 -1.05624,-36.05058 -2.66257,-51.83948 -3.56254,-2.85658 -5.26761,-3.68874 -10.57379,-3.2979 0,0 -0.59856,-3.61055 -0.59856,-3.61055"
- id="path4483"
- sodipodi:nodetypes="cssssssscssssssscccssssssscscccc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(-0.54348326,0,0,-0.54348326,476.11679,570.61482)"
- id="g4205">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 359.65277,577.01577 c 0,0 -59.16286,4.26162 -59.16286,4.26162 0,0 -58.60697,3.37465 -58.60697,3.37465 0,0 -56.74704,0.77941 -56.74704,0.77941 0,0 -61.4929,0.34102 -61.4929,0.34102 0,0 -48.343698,0.74654 -48.343698,0.74654 0,0 -46.245335,0.34978 -46.245335,0.34978 0,0 -47.363307,1.67834 -47.363307,1.67834 0,0 -50.516342,-0.61593 -50.516342,-0.61593 0,0 -10.089035,10.78371 -10.089035,10.78371 0,0 -4.08314,52.84346 -4.08314,52.84346 0,0 61.701955,-0.64928 61.701955,-0.64928 0,0 59.493133,1.79019 59.493133,1.79019 0,0 42.164503,0.0234 42.164503,0.0234 0,0 43.474376,-2.31088 43.474376,-2.31088 0,0 42.52013,-1.78103 42.52013,-1.78103 0,0 43.2598,-2.5413 43.2598,-2.5413 0,0 41.43073,0.35015 41.43073,0.35015 0,0 41.27137,-3.20444 41.27137,-3.20444 0,0 43.71222,-2.58657 43.71222,-2.58657 0,0 44.50423,-1.39193 44.50423,-1.39193 0,0 9.15344,-7.17522 9.15344,-7.17522 0,0 -3.67826,-27.80415 -3.67826,-27.80415 -0.4716,0.0257 -0.86706,-1.05595 -1.34487,-1.05595 -13.57727,0 -24.12816,-10.2924 -25.65143,-23.82928 0,0 -0.58432,0.23351 -0.58432,0.23351 M 15.714191,602.08967 c 9.54089,0 18.595446,8.90567 18.595446,19.29843 0,10.39276 -7.91331,18.68118 -17.4542,18.68118 -9.5409013,-1e-5 -14.4348876,-10.07194 -14.4348876,-20.4647 -1e-6,-10.39276 2.3380522,-17.49456 11.8789406,-17.49456 0,0 -0.221121,1.82276 -0.221121,1.82276"
- id="path4207"
- sodipodi:nodetypes="cccccccccccccccccccccccsccsssc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 355.95139,583.83974 c -9.52227,0.29252 -17.41211,-1.23315 -26.93427,-0.94027 -9.52215,0.29287 -19.13336,1.9529 -28.65544,2.24602 -9.52208,0.29312 -19.75207,-0.5367 -29.2741,-0.24345 -9.52204,0.29325 -18.19891,2.9821 -27.72095,3.27537 -9.52203,0.29326 -17.40006,-1.37654 -26.92213,-1.08336 -9.52207,0.29317 -20.79548,0.10544 -30.31763,0.39841 -9.52214,0.29297 -18.66643,0.55951 -28.18869,0.85216 -9.52225,0.29265 -19.6453,-0.26749 -29.1677,0.0247 -7.92796,0.035 -16.44977,1.08621 -24.37904,1.13222 -7.929276,0.046 -11.804225,2.41944 -19.734265,2.47113 -7.930029,0.0517 -19.491153,-0.90606 -27.421386,-0.85408 -7.930232,0.052 -15.737901,0.031 -23.667774,0.0779 -7.929874,0.0469 -17.527057,0.25525 -25.4560141,0.29169 -7.92895695,0.0364 -14.1359957,-1.9961 -22.0634769,-1.9755 -7.927483,0.0206 -15.295263,1.69114 -23.220712,1.69051 -7.925449,-6.3e-4 -15.758998,-0.15499 -23.681855,-0.18222 -2.651095,-0.22084 -4.732824,0.53028 -6.582268,2.17802 -1.849445,1.64773 -4.968679,3.88402 -6.763554,5.29518 -0.8788,7.88639 -1.659058,15.77568 -2.176037,23.85628 -0.516979,8.08059 -0.295827,16.7772 -0.942862,24.78718 9.254,0.19109 16.125556,1.25905 25.380915,1.44903 9.255358,0.18998 22.680187,-0.43424 31.935999,-0.24463 9.255812,0.18961 17.228779,-0.0117 26.484139,0.17827 9.25536,0.18998 18.469895,-0.66308 27.723897,-0.47199 6.944966,-0.24387 13.129662,-0.18267 20.074191,-0.43817 6.944528,-0.2555 14.314069,-0.28096 21.258209,-0.5469 6.944138,-0.26593 14.825537,-0.24453 21.769337,-0.51969 6.943797,-0.27516 10.106247,-0.21128 17.049757,-0.49446 6.94351,-0.28318 16.19685,-0.76795 23.14011,-1.05795 6.94327,-0.29 12.60244,-0.37702 19.54552,-0.67263 6.94308,-0.29561 15.35326,0.0399 22.29619,-0.26014 6.94293,-0.30001 12.90546,-0.93464 19.8483,-1.23786 6.94284,-0.30321 15.78707,-0.76752 22.72986,-1.07273 6.9428,-0.30522 13.48906,-2.83959 20.43185,-3.14559 6.9428,-0.30601 13.55501,1.11578 20.49786,0.81019 6.94285,-0.30559 14.41304,-0.0242 21.35599,-0.32819 6.94295,-0.30397 13.31437,-1.37681 20.25746,-1.67796 6.9431,-0.30115 12.45415,0.69137 19.39745,0.39424 6.9433,-0.29712 15.50282,-1.30032 22.44637,-1.59221 6.94354,-0.29189 13.56888,-0.3274 20.51272,-0.61285 3.43619,0.44959 6.93735,0.41434 10.15254,-0.54605 3.21519,-0.96038 3.9353,-2.48137 6.63835,-4.62069 -0.36982,-3.85802 1.93621,-8.96676 1.56713,-12.82637 -0.36909,-3.85961 -0.89017,-6.22006 -1.26275,-10.07984 -0.10838,0.003 1.26048,-3.31937 1.15076,-3.31223 -0.10971,0.007 -2.16349,1.36535 -2.27249,1.36535 -6.69153,0 -11.56643,-1.59073 -16.22662,-5.80865 -4.66019,-4.21792 -8.73086,-11.16501 -9.61731,-17.79334 0,0 -0.64076,2.49275 -0.64076,2.49275 M 17.435333,598.54399 c 5.683935,0 10.543788,2.62234 14.271241,6.68386 3.727453,4.06152 8.77821,10.52285 8.778212,16.71428 2e-6,6.19143 -3.408329,10.22137 -7.135784,14.28288 -3.727455,4.06152 -10.417729,7.10524 -16.101664,7.10524 -5.683941,0 -10.0609178,-4.92939 -13.7883698,-8.9909 -3.72745297,-4.06152 -7.2898871,-7.45218 -7.2898871,-13.64361 0,-6.19143 2.1395094,-11.7577 5.8669634,-15.81922 3.727454,-4.06152 8.9345035,-8.37472 14.6184375,-8.37472 0,0 2.630495,-2.42012 2.630495,-2.42012"
- id="path4209"
- sodipodi:nodetypes="cssssssscssssssscscscssscssssssssssssssscscscsssccsssssssc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g4755"
- transform="matrix(0.54348326,0,0,0.54348326,338.97145,-153.2338)">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 302.65277,630.01577 c 0,0 -59.16286,4.26162 -59.16286,4.26162 0,0 -58.60697,3.37465 -58.60697,3.37465 0,0 -56.74704,0.77941 -56.74704,0.77941 0,0 -61.4929,0.34102 -61.4929,0.34102 0,0 -48.343698,0.74654 -48.343698,0.74654 0,0 -46.245335,0.34978 -46.245335,0.34978 0,0 -47.363307,1.67834 -47.363307,1.67834 0,0 -50.51634,-0.61593 -50.51634,-0.61593 0,0 -10.08904,10.78371 -10.08904,10.78371 0,0 -4.08314,52.84346 -4.08314,52.84346 0,0 61.701958,-0.64928 61.701958,-0.64928 0,0 59.493133,1.79019 59.493133,1.79019 0,0 42.164503,0.0234 42.164503,0.0234 0,0 43.474376,-2.31088 43.474376,-2.31088 0,0 42.52013,-1.78103 42.52013,-1.78103 0,0 43.2598,-2.5413 43.2598,-2.5413 0,0 41.43073,0.35015 41.43073,0.35015 0,0 41.27137,-3.20444 41.27137,-3.20444 0,0 43.71222,-2.58657 43.71222,-2.58657 0,0 44.50423,-1.39193 44.50423,-1.39193 0,0 9.15344,-7.17522 9.15344,-7.17522 0,0 -3.67826,-27.80415 -3.67826,-27.80415 -0.4716,0.0257 -0.86706,-1.05595 -1.34487,-1.05595 -13.57727,0 -24.12816,-10.2924 -25.65143,-23.82928 0,0 -0.58432,0.23351 -0.58432,0.23351 m -342.714959,22.46412 c 9.54089,0 18.595446,8.90567 18.595446,19.29843 0,10.39276 -7.91331,18.68118 -17.4542,18.68118 -9.540901,-10e-6 -14.434888,-10.07194 -14.434888,-20.4647 -1e-6,-10.39276 2.338053,-17.49456 11.878941,-17.49456 0,0 -0.221121,1.82276 -0.221121,1.82276"
- id="path3243"
- sodipodi:nodetypes="cccccccccccccccccccccccsccsssc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#784421;fill-opacity:1;fill-rule:evenodd;stroke:none"
- d="m 298.95139,636.83974 c -9.52227,0.29252 -17.41211,-1.23315 -26.93427,-0.94027 -9.52215,0.29287 -19.13336,1.9529 -28.65544,2.24602 -9.52208,0.29312 -19.75207,-0.5367 -29.2741,-0.24345 -9.52204,0.29325 -18.19891,2.9821 -27.72095,3.27537 -9.52203,0.29326 -17.40006,-1.37654 -26.92213,-1.08336 -9.52207,0.29317 -20.79548,0.10544 -30.31763,0.39841 -9.52214,0.29297 -18.66643,0.55951 -28.18869,0.85216 -9.52225,0.29265 -19.6453,-0.26749 -29.1677,0.0247 -7.92796,0.035 -16.44977,1.08621 -24.37904,1.13222 -7.929276,0.046 -11.804225,2.41944 -19.734265,2.47113 -7.930029,0.0517 -19.491153,-0.90606 -27.421386,-0.85408 -7.930232,0.052 -15.737901,0.031 -23.667774,0.0779 -7.929874,0.0469 -17.527057,0.25525 -25.456014,0.29169 -7.928957,0.0364 -14.135996,-1.9961 -22.063477,-1.9755 -7.927483,0.0206 -15.295263,1.69114 -23.220712,1.69051 -7.925452,-6.3e-4 -15.759002,-0.15499 -23.681852,-0.18222 -2.6511,-0.22084 -4.73283,0.53028 -6.58227,2.17802 -1.84945,1.64773 -4.96868,3.88402 -6.76355,5.29518 -0.87881,7.88639 -1.65906,15.77568 -2.17604,23.85628 -0.51698,8.08059 -0.29583,16.7772 -0.94286,24.78718 9.254,0.19109 16.12555,1.25905 25.38091,1.44903 9.255359,0.18998 22.680188,-0.43424 31.936,-0.24463 9.255812,0.18961 17.228779,-0.0117 26.484139,0.17827 9.25536,0.18998 18.469895,-0.66308 27.723897,-0.47199 6.944966,-0.24387 13.129662,-0.18267 20.074191,-0.43817 6.944528,-0.2555 14.314069,-0.28096 21.258209,-0.5469 6.944138,-0.26593 14.825537,-0.24453 21.769337,-0.51969 6.943797,-0.27516 10.106247,-0.21128 17.049757,-0.49446 6.94351,-0.28318 16.19685,-0.76795 23.14011,-1.05795 6.94327,-0.29 12.60244,-0.37702 19.54552,-0.67263 6.94308,-0.29561 15.35326,0.0399 22.29619,-0.26014 6.94293,-0.30001 12.90546,-0.93464 19.8483,-1.23786 6.94284,-0.30321 15.78707,-0.76752 22.72986,-1.07273 6.9428,-0.30522 13.48906,-2.83959 20.43185,-3.14559 6.9428,-0.30601 13.55501,1.11578 20.49786,0.81019 6.94285,-0.30559 14.41304,-0.0242 21.35599,-0.32819 6.94295,-0.30397 13.31437,-1.37681 20.25746,-1.67796 6.9431,-0.30115 12.45415,0.69137 19.39745,0.39424 6.9433,-0.29712 15.50282,-1.30032 22.44637,-1.59221 6.94354,-0.29189 13.56888,-0.3274 20.51272,-0.61285 3.43619,0.44959 6.93735,0.41434 10.15254,-0.54605 3.21519,-0.96038 3.9353,-2.48137 6.63835,-4.62069 -0.36982,-3.85802 1.93621,-8.96676 1.56713,-12.82637 -0.36909,-3.85961 -0.89017,-6.22006 -1.26275,-10.07984 -0.10838,0.003 1.26048,-3.31937 1.15076,-3.31223 -0.10971,0.007 -2.16349,1.36535 -2.27249,1.36535 -6.69153,0 -11.56643,-1.59073 -16.22662,-5.80865 -4.66019,-4.21792 -8.73086,-11.16501 -9.61731,-17.79334 0,0 -0.64076,2.49275 -0.64076,2.49275 m -338.870877,14.07762 c 5.683935,0 10.543788,2.62234 14.271241,6.68386 3.727453,4.06152 8.77821,10.52285 8.778212,16.71428 2e-6,6.19143 -3.408329,10.22137 -7.135784,14.28288 -3.727455,4.06152 -10.417729,7.10524 -16.101664,7.10524 -5.683941,0 -10.060918,-4.92939 -13.78837,-8.9909 -3.727453,-4.06152 -7.289887,-7.45218 -7.289887,-13.64361 0,-6.19143 2.13951,-11.7577 5.866964,-15.81922 3.727453,-4.06152 8.934503,-8.37472 14.618437,-8.37472 0,0 2.630495,-2.42012 2.630495,-2.42012"
- id="path3245"
- sodipodi:nodetypes="cssssssscssssssscscscssscssssssssssssssscscscsssccsssssssc"
- inkscape:connector-curvature="0" />
- </g>
- <g
- id="g4680"
- transform="matrix(0.54326897,-0.01526028,0.01526028,0.54326897,329.49144,-153.84102)">
- <path
- id="path3249"
- d="m -129.625,582.28125 c 0,0 -0.061,0.64089 -0.0625,0.65625 l 0.21875,-0.46875 c 0,0 -0.15625,-0.18751 -0.15625,-0.1875 z m -0.0625,0.65625 -0.875,1.84375 c 0,0 0.65386,-7e-4 0.6875,0 0.0158,-0.15908 0.18321,-1.80056 0.1875,-1.84375 z m -0.1875,1.84375 c -0.45324,4.561 -5.25,52.87502 -5.25,52.875 0,0 11.84375,6.75 11.84375,6.75 0,0 41.562502,2.18749 41.5625,2.1875 0,0 42.09375,2.71875 42.09375,2.71875 0,0 44.1562498,0.0312 44.15625,0.0312 0,0 44.718749,3.43751 44.71875,3.4375 0,0 39.875001,4.78125 39.875,4.78125 0,0 41.75,-0.28127 41.75,-0.28125 0,0 43.81251,5.71877 43.8125,5.71875 0,0 40.0625,-0.18748 40.0625,-0.1875 0,0 30.75,-0.28123 30.75,-0.28125 0,0 28.4375,-2.78123 28.4375,-2.78125 0,0 32.53126,2.40623 32.53125,2.40625 0,0 30.84376,-1.68751 30.84375,-1.6875 0,0 -1.05261,-11.892 -2.03125,-22.96875 -2.97723,2.31102 -5.23814,3.59137 -9.25,4.75 0,10e-6 -0.8553,0.0337 -1.65625,0.0625 -3.91771,1.15577 -8.37087,2.45543 -12,2.0625 -4.10398,-0.44435 -8.22857,-1.98792 -11.78125,-3.875 -3.55267,-1.88708 -5.60809,-5.70684 -8.1875,-8.8125 -2.57941,-3.10567 -6.15964,-6.96239 -7.34375,-11.0625 -1.1841,-4.10007 0.56724,-7.62233 1.09375,-11.625 0.52652,-4.00265 2.31289,-6.13442 4.3125,-9.625 0.394,-0.68778 0.79331,-1.44114 1.1875,-2.21875 -3.39124,0.16366 -25.40625,1.25002 -25.40625,1.25 0,0 -29.3125,-1.81248 -29.3125,-1.8125 0,0 -30.40626,1.375 -30.40625,1.375 0,0 -29.31249,-1.50003 -29.3125,-1.5 0,0 -30.21875,0.15623 -30.21875,0.15625 0,0 -29.5,-1.93752 -29.5,-1.9375 0,0 -28.968751,0.0625 -28.96875,0.0625 0,0 -26.625002,-0.62502 -26.625,-0.625 0,0 -28.062499,-2.87502 -28.0625,-2.875 0,0 -28.6562502,1.31247 -28.65625,1.3125 0,0 -25.375,-4.84378 -25.375,-4.84375 0,0 -24.78125,1.71876 -24.78125,1.71875 0,0 -29.031248,-2.49998 -29.03125,-2.5 0,0 -29.1875,-1.59375 -29.1875,-1.59375 0,0 -25.38094,-0.53529 -26.6875,-0.5625 z m 454.25,57.53125 c 0.51259,-0.15122 1.04146,-0.3273 1.53125,-0.46875 l -2.6875,0.5 c 0,0 0.5973,-0.0111 1.15625,-0.0312 z"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
- <path
- id="path3251"
- d="m -97.5625,588.40625 c -9.13293,0.0776 -17.33659,3.30435 -27.21875,2.90625 -1.66454,15.77166 -4.71046,28.60334 -6.375,44.375 5.36483,4.33026 11.61929,6.77077 18.5,5.9375 13.881567,0.70401 30.525474,1.95994 44.40625,2.6875 13.880774,0.72753 24.525939,-1.58517 38.40625,-0.84375 13.880311,0.74144 29.61982,3.78567 43.5,4.53125 13.88019,0.74556 25.71335,-0.64629 39.59375,0.0937 13.880398,0.74002 28.18155,2.43146 42.0625,3.15625 13.88095,0.7248 27.86816,3.42515 41.75,4.125 13.88183,0.69983 26.61695,2.36606 40.5,3.03125 13.88306,0.66522 29.39663,-1.0271 43.28125,-0.40625 18.51082,-0.20478 36.42668,0.0485 54.9375,-0.15625 18.51083,-0.20477 36.33294,0.29852 54.84375,0.0937 -0.27127,-3.81334 -0.48433,-7.84606 -0.65625,-12 -0.19385,0.0765 -0.40222,0.13933 -0.59375,0.21875 -4.14636,1.71928 -9.40425,4.25 -14.1875,4.25 -4.78323,3e-5 -8.04115,-2.81198 -12.1875,-4.53125 -4.14634,-1.71925 -5.89441,-4.20778 -9.03125,-7.28125 -3.13683,-3.07348 -7.99528,-6.43742 -9.75,-10.5 -1.75472,-4.06259 -4.46875,-10.06339 -4.46875,-14.75 10e-6,-4.68662 1.71402,-8.31241 3.46875,-12.375 0.0558,-0.1291 0.12836,-0.24792 0.1875,-0.375 -6.02687,0.0446 -12.20158,0.16017 -18.375,0.0625 -9.05292,-0.14323 -17.94552,-0.32926 -27.28125,-0.5 -9.33574,-0.17075 -21.22588,3.59134 -30.65625,3.40625 -9.43038,-0.18508 -21.28814,-1.71996 -30.625,-1.90625 -9.33686,-0.18627 -15.41359,-1.13817 -24.46875,-1.3125 -9.05516,-0.17433 -17.41471,-0.41328 -26,-0.5625 -8.5853,-0.14921 -17.72899,0.3297 -25.65625,0.21875 -10.540972,-0.42462 -18.17777,-1.63396 -28.0625,-2.03125 -9.884719,-0.3973 -18.11528,0.44026 -27.53125,0.0625 -9.41598,-0.37776 -20.30278,-3.63396 -29.4375,-4 -9.1347202,-0.36604 -18.33403,-0.20036 -27.375,-0.5625 -9.040974,-0.36217 -19.459028,0.2723 -28.59375,-0.0937 -9.134723,-0.36603 -16.177778,-2.62224 -25.59375,-3 -9.415969,-0.37779 -19.58403,-1.5402 -29.46875,-1.9375 -0.617796,-0.0248 -1.234888,-0.0364 -1.84375,-0.0312 z"
- style="fill:#a05a2c;fill-opacity:1;fill-rule:evenodd;stroke:none"
- inkscape:connector-curvature="0" />
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient10152);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ id="rect9560"
+ width="887.92407"
+ height="442.44681"
+ x="-64.649765"
+ y="-36.594059"
+ ry="5.9749599" />
+ <path
+ style="fill:#d2c4a2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 269.71094,301.80664 c -8.08122,0 -163.64495,23.23399 -172.736331,24.24414 26.520171,4.80938 53.840401,4.09099 80.785161,3.43555 28.75793,-0.89431 212.03025,21.28537 260.85546,24.66015 31.60611,2.18461 186.96182,5.50801 293.24916,-0.89023 -4.9921,-0.44412 -37.11162,-10.43302 -42.1183,-10.83242 l -0.40234,-1.70899 c -1.66807,-3.41969 -6.41381,-5.28563 -10.94336,-4.30273 -2.85708,0.62215 -5.14409,2.28948 -6.12695,4.4668 l -0.33203,-1.59571 c -2.31572,-5.37391 -8.90611,-8.30702 -15.19727,-6.76367 -1.61259,0.3982 -3.11904,1.07475 -4.43164,1.99024 -2.00183,-1.29664 -4.57514,-1.71315 -6.97461,-1.12891 -3.03247,0.74373 -5.29491,2.9612 -5.79687,5.68164 -74.61106,-4.17229 -142.75847,-4.78779 -172.84961,-7.96094 -21.94041,-2.31365 -50.50863,-9.09179 -58.58985,-9.09179 -8.08122,0 -30.30354,9.09177 -38.38476,4.04101 -8.08122,-5.05076 -25.25472,-6.06015 -33.33594,-7.07031 -8.08122,-1.01015 -58.5887,-17.17383 -66.66992,-17.17383 z m 504.60937,36.37305 c -0.9434,0.0236 -1.87943,0.12063 -2.78906,0.28906 -1.38205,0.26091 -6.14948,7.12025 -7.30969,7.6848 4.02956,-0.268 16.41289,-0.62845 20.2503,-0.88964 4.22234,4.42491 -8.26081,-7.12906 -10.15155,-7.08422 z"
+ id="path9491-4"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sccsccccccccccssscsccccc" />
+ <path
+ style="fill:#bca76e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.9950133px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 86.898438,326.625 c 0,0 82.619492,10.45706 103.445312,9.41797 20.8258,-1.03911 136.61769,19.90108 183.78906,23.71875 47.17135,3.81767 430.85389,11.73992 465.92188,0.0801 35.06799,-11.65979 12.52929,-15.50782 12.52929,-15.50782 l -11.88281,-4.95312 c -5.18426,0.4552 -11.68175,0.94424 -18.83594,1.44726 -1.38642,0.34223 -2.73319,0.74662 -3.93359,1.4336 -2.23373,1.24445 -4.47638,2.45408 -7.12305,1.96484 -4.20348,-1.48964 -8.72448,-0.0984 -12.68359,-0.20703 -2.64659,-4.1568 -7.70541,1.91305 -11.74219,1.03516 -3.29493,-1.29748 -7.56021,0.13797 -11.75,0.24219 -3.04226,-1.06712 -47.98395,2.68043 -52.125,2.64843 -4.16085,0.49826 -8.79264,-0.43586 -12.40039,-2.1875 -4.01138,2.63952 -9.25537,4.00054 -14.10742,4.45508 -2.15798,-2.42681 -7.5504,-0.9385 -10.65039,-3.0293 -1.62337,-0.20924 -3.24529,-0.42431 -4.86328,-0.6582 -109.14162,5.2318 -208.76875,9.90912 -241.8711,7.62109 C 389.79002,350.7717 206.5177,328.59202 177.75977,329.48633 149.00184,330.38067 86.898438,326.625 86.898438,326.625 Z"
+ id="path10288"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsscccccccccccccscc" />
+ <path
+ style="fill:#c7b585;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m -67.679688,339.18359 -1.009765,222.23243 903.076173,-6.06055 c 0,0 9.7803,-141.355 6.11535,-198.3859 -46.91728,10.73553 -425.67764,0.93696 -471.97107,-2.80966 -93.79232,-6.01014 -180.44756,-29.40207 -292.525526,-26.54464 -54.34194,3.41685 -128.79377,4.48468 -143.685162,11.56832 z"
+ id="path9491"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
</g>
<g
- transform="matrix(0.54348326,0,0,0.54348326,479.0833,200.09748)"
- id="g4723">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4725"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4727"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,248.84375,173.07763)"
- id="g3425">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path3427"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path3429"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,248.84375,195.53075)"
- id="g4687">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4689"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4691"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,249.22431,216.84218)"
- id="g4693">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4695"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4697"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,248.84375,246.14539)"
- id="g4699">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4701"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4703"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,248.08263,275.44861)"
- id="g4705">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4707"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4709"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,250.366,308.55744)"
- id="g4711">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4713"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4715"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,479.46387,177.26381)"
- id="g4717">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4719"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4721"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,479.46387,225.21453)"
- id="g4729">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4731"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4733"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,480.60555,259.84559)"
- id="g4735">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4737"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4739"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,480.98611,278.87366)"
- id="g4741">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4743"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4745"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
- </g>
- <g
- transform="matrix(0.54348326,0,0,0.54348326,483.65004,298.28228)"
- id="g4747">
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4749"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="translate(20.961722,8.8259882)" />
- <path
- sodipodi:type="arc"
- style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none"
- id="path4751"
- sodipodi:cx="34.936199"
- sodipodi:cy="22.802696"
- sodipodi:rx="7.7227392"
- sodipodi:ry="7.3549895"
- d="m 42.658938,22.802696 a 7.7227392,7.3549895 0 0 1 -7.722739,7.35499 7.7227392,7.3549895 0 0 1 -7.722739,-7.35499 7.7227392,7.3549895 0 0 1 7.722739,-7.354989 7.7227392,7.3549895 0 0 1 7.722739,7.354989 z"
- transform="matrix(0.6,0,0,0.6,34.421351,17.947066)" />
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Layer 2"
+ style="display:inline">
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.14333105px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 291.38521,170.36129 c 0,0 -2.02012,-5.88633 -6.11362,-7.82678 -4.0935,-1.94045 -17.24496,0.38563 -17.24496,0.38563 0,0 -0.91749,233.38789 -0.0248,235.54183 0.8927,2.15394 13.51673,1.45371 16.19484,1.09472 2.67811,-0.35898 5.27766,-3.6105 4.87485,-5.37597 -0.78654,-3.44735 2.16124,-221.84439 2.31368,-223.81943 z"
+ id="path1371-6-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="czccsscc" />
+ <path
+ style="fill:#c9956f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 287.88408,168.13633 c 0,0 -0.30169,-2.23215 -3.15102,-3.50114 -2.84933,-1.26899 -14.00452,0 -14.00452,0 0,0 -1.05034,229.32409 -0.35011,231.42477 0.70022,2.10068 10.85351,1.75057 12.95418,1.40046 2.10068,-0.35011 4.16721,-2.82966 3.85125,-4.55148 -0.61696,-3.36211 0.58064,-222.84641 0.70022,-224.77261 z"
+ id="path1371-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="czccssc" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.14333105px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 499.61141,170.36129 c 0,0 2.02012,-5.88633 6.11362,-7.82678 4.0935,-1.94045 17.24496,0.38563 17.24496,0.38563 0,0 0.91749,233.38789 0.0248,235.54183 -0.8927,2.15394 -13.51673,1.45371 -16.19484,1.09472 -2.67811,-0.35898 -5.27766,-3.6105 -4.87485,-5.37597 0.78654,-3.44735 -2.16124,-221.84439 -2.31368,-223.81943 z"
+ id="path1371-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="czccsscc" />
+ <path
+ style="fill:#c9956f;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 503.11254,168.13633 c 0,0 0.30169,-2.23215 3.15102,-3.50114 2.84933,-1.26899 14.00452,0 14.00452,0 0,0 1.05034,229.32409 0.35011,231.42477 -0.70022,2.10068 -10.85351,1.75057 -12.95418,1.40046 -2.10068,-0.35011 -4.16721,-2.82966 -3.85125,-4.55148 0.61696,-3.36211 -0.58064,-222.84641 -0.70022,-224.77261 z"
+ id="path1371"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="czccssc" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.07292342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 268.28019,168.11102 c -1.20619,6.50498 -3.68911,18.96192 -3.61814,25.64008 6.93978,8.36699 167.38549,3.88208 255.17734,5.82312 4.16853,-0.99097 8.95235,-32.16669 1.98569,-30.93929 -44.32262,1.0975 -240.91884,-2.04605 -253.54489,-0.52391 z"
+ id="path1166-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#d0a17e;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 271.34371,169.81496 c -1.17703,5.79076 -3.59993,16.87999 -3.53068,22.82492 6.77202,7.44834 163.33917,3.45585 249.00876,5.18377 4.06776,-0.88216 8.73594,-28.63494 1.93769,-27.54231 -43.25118,0.977 -235.09494,-1.8214 -247.41577,-0.46638 z"
+ id="path1166"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6"
+ cx="279.539"
+ cy="181.74266"
+ r="4" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183"
+ cx="279.539"
+ cy="181.44637"
+ r="2.814815" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-7"
+ cx="513.539"
+ cy="183.74266"
+ r="4" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-5"
+ cx="513.539"
+ cy="183.44637"
+ r="2.814815" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.07292342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 268.02704,228.3404 c -1.09169,6.52517 -2.65509,20.07416 -2.46678,26.75004 7.08574,8.24375 167.42786,-0.11028 255.24026,0.28771 4.15048,-1.06407 7.68548,-32.31904 0.74147,-30.9694 -44.29649,1.8762 -240.9176,2.18787 -253.51495,3.93165 z"
+ id="path1166-3-7"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#d0a17e;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 271.12003,229.99025 c -1.07509,5.81055 -2.60251,17.99098 -2.42881,23.93377 6.90187,7.32819 163.37468,-0.46534 249.06141,-0.24314 4.05163,-0.9535 7.53116,-28.78403 0.75316,-27.57211 -43.22733,1.7369 -235.09064,2.31015 -247.38576,3.88148 z"
+ id="path1166-0"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-9"
+ cx="275.2319"
+ cy="246.64676"
+ r="4"
+ transform="rotate(-1.0068974)" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.07292342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 522.03356,224.51856 c 3.28728,-4.31236 3.58955,-18.73994 3.08573,-25.70959 -7.97213,-7.79112 -170.09942,-0.8265 -255.24322,-2.28153 -4.14709,1.07719 -8.28347,34.09596 -1.34376,32.72438 44.29034,-2.01626 240.90947,-2.94966 253.50125,-4.73326 z"
+ id="path1166-3-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-3"
+ cx="275.2319"
+ cy="246.35046"
+ r="2.814815"
+ transform="rotate(-1.0068974)" />
+ <path
+ style="fill:#d9b08b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 518.93536,222.8785 c 2.80957,-3.18463 3.25985,-16.93498 3.05667,-22.89322 -7.36382,-6.64809 -165.75535,2.27566 -250.11305,0.33051 -4.0486,0.96632 -7.09,28.45981 -0.31587,27.22646 43.22163,-1.87357 235.08217,-3.05351 247.37225,-4.6637 z"
+ id="path1166-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-2"
+ cx="-508.45755"
+ cy="-221.71346"
+ r="4"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-9"
+ cx="-508.47208"
+ cy="-221.30968"
+ r="2.814815"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-7-1"
+ cx="-273.75748"
+ cy="-219.69893"
+ r="4"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-5-2"
+ cx="-273.772"
+ cy="-219.29515"
+ r="2.814815"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-7-6"
+ cx="509.2319"
+ cy="248.64676"
+ r="4"
+ transform="rotate(-1.0068974)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-5-0"
+ cx="509.2319"
+ cy="248.35046"
+ r="2.814815"
+ transform="rotate(-1.0068974)" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.07292342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 522.02927,282.56255 c 3.28878,-4.31122 3.94616,-19.43893 3.44475,-26.40875 -7.96943,-7.79388 -170.44923,-0.1852 -255.59252,-1.66973 -4.14747,1.07575 -7.94518,34.79332 -1.00499,33.42414 44.29104,-2.00091 240.56037,-3.56642 253.15276,-5.34566 z"
+ id="path1166-3-5-6"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#d9b08b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 518.93164,280.92142 c 2.81068,-3.18366 3.61583,-17.63408 3.41471,-23.59239 -7.36151,-6.65064 -166.10623,2.91846 -250.46326,0.94408 -4.04893,0.96492 -6.74975,29.15759 0.0248,27.92658 43.22228,-1.85859 234.73311,-3.67229 247.02374,-5.27822 z"
+ id="path1166-6-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-2-6"
+ cx="-507.35141"
+ cy="-279.56607"
+ r="4"
+ transform="rotate(178.83178)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-9-1"
+ cx="-507.36594"
+ cy="-279.16229"
+ r="2.814815"
+ transform="rotate(178.83178)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-7-1-8"
+ cx="-272.65134"
+ cy="-277.55154"
+ r="4"
+ transform="rotate(178.83178)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-5-2-7"
+ cx="-272.66586"
+ cy="-277.14777"
+ r="2.814815"
+ transform="rotate(178.83178)" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.07292342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 267.9808,286.78994 c -1.06859,6.52899 -3.28797,20.08592 -3.07603,26.76109 7.11487,8.21861 167.43014,-0.7029 255.2434,-0.61572 4.14668,-1.07875 8.27127,-32.34852 1.33207,-30.97431 -44.28957,2.03297 -240.90834,3.04058 -253.49944,4.82894 z"
+ id="path1166-3-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#d0a17e;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 271.07961,288.42882 c -1.05452,5.81432 -3.24277,18.00257 -3.04802,23.94471 6.92775,7.30372 163.37572,-1.04334 249.0627,-1.12474 4.04823,-0.96784 8.12946,-28.81299 1.35579,-27.57708 -43.22091,1.88988 -235.08099,3.14223 -247.37047,4.75706 z"
+ id="path1166-2"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-0"
+ cx="273.12531"
+ cy="306.01517"
+ r="4"
+ transform="rotate(-1.2096949)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-2"
+ cx="273.12531"
+ cy="305.71884"
+ r="2.814815"
+ transform="rotate(-1.2096949)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-7-3"
+ cx="507.12531"
+ cy="308.01517"
+ r="4"
+ transform="rotate(-1.2096949)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-5-7"
+ cx="507.12531"
+ cy="307.71884"
+ r="2.814815"
+ transform="rotate(-1.2096949)" />
+ <path
+ style="fill:#986d4d;fill-opacity:1;stroke:none;stroke-width:1.07292342px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 522.03356,340.51856 c 3.28728,-4.31236 3.58955,-18.73994 3.08573,-25.70959 -7.97213,-7.79112 -170.09942,-0.8265 -255.24322,-2.28153 -4.14709,1.07719 -8.28347,34.09596 -1.34376,32.72438 44.29034,-2.01626 240.90947,-2.94966 253.50125,-4.73326 z"
+ id="path1166-3-5-5"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccc" />
+ <path
+ style="fill:#d9b08b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 518.93536,338.8785 c 2.80957,-3.18463 3.25985,-16.93498 3.05667,-22.89322 -7.36382,-6.64809 -165.75535,2.27566 -250.11305,0.33051 -4.0486,0.96632 -7.09,28.45981 -0.31587,27.22646 43.22163,-1.87357 235.08217,-3.05351 247.37225,-4.6637 z"
+ id="path1166-6-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccc" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-2-2"
+ cx="-506.05246"
+ cy="-337.68851"
+ r="4"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-9-2"
+ cx="-506.06699"
+ cy="-337.28473"
+ r="2.814815"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#707070;fill-opacity:1;stroke:none;stroke-width:1.20261884;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-6-7-1-89"
+ cx="-271.35239"
+ cy="-335.67398"
+ r="4"
+ transform="rotate(178.81193)" />
+ <circle
+ style="opacity:1;vector-effect:none;fill:#c4c4c4;fill-opacity:1;stroke:none;stroke-width:0.84628737;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="path1183-5-2-73"
+ cx="-271.36691"
+ cy="-335.2702"
+ r="2.814815"
+ transform="rotate(178.81193)" />
+ <path
+ style="fill:#6a9b53;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 606.14081,341.19331 c 8.48581,6.22293 18.38593,8.76867 22.34598,4.80863 3.96004,-3.96005 12.91829,-33.19497 0,-39.03475 -20.64881,-9.3344 -6.84072,19.90089 -11.03156,28.00319 -2.49969,4.83273 -10.55252,-7.93297 -14.14303,-4.52576 -2.68746,2.55024 2.82861,10.74869 2.82861,10.74869 z"
+ id="path10256-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssc" />
+ <path
+ style="fill:#7aab63;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.87432617px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 605.83474,338.09026 c 7.7576,5.20365 16.80815,7.33241 20.42838,4.021 3.62021,-3.31141 11.80972,-27.75778 0,-32.64103 -18.87685,-7.80547 -6.25369,16.64121 -10.0849,23.41639 -2.28518,4.04115 -9.64696,-6.63359 -12.92936,-3.78446 -2.45684,2.13252 2.58588,8.9881 2.58588,8.9881 z"
+ id="path10256-1-1"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssc" />
+ <path
+ style="fill:#6a9b53;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10079312px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 592.75856,390.08487 c -7.63122,-25.51942 -19.12138,-116.93051 1.69584,-129.78461 57.91977,-35.76403 20.34993,102.80693 23.7416,125.40986 -11.02289,10.93692 -25.43744,4.37475 -25.43744,4.37475 z"
+ id="path10254-9"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscc" />
+ <path
+ style="fill:#6a9b53;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 594.67943,336.55321 c -10.71428,7.85715 -23.21428,11.07143 -28.21428,6.07143 -5,-5 -16.31079,-41.91234 0,-49.28571 26.07142,-11.78572 8.63716,25.12709 13.92857,35.35714 3.15613,6.10186 13.32373,-10.01626 17.85715,-5.71428 3.39321,3.21997 -3.57144,13.57142 -3.57144,13.57142 z"
+ id="path10256-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssc" />
+ <path
+ style="fill:#7aab63;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.838543px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 589.64573,335.44102 c -8.52968,6.93978 -18.13085,8.37832 -22.11136,3.9621 -3.98052,-4.41623 -13.68531,-36.31865 -0.70023,-42.83114 20.75554,-10.40968 6.63603,23.70967 11.08857,32.62947 4.26318,8.54046 9.55673,-3.59511 13.16579,0.20459 2.70136,2.84403 -1.44277,6.03498 -1.44277,6.03498 z"
+ id="path10256"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cssssc" />
+ <path
+ style="fill:#7aab63;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 593.96515,390.12461 c -6.42857,-24.99997 -16.10791,-114.55037 1.42857,-127.14282 48.79179,-35.03605 17.14285,100.71428 20,122.85712 -9.28572,10.7143 -21.42857,4.2857 -21.42857,4.2857 z"
+ id="path10254"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cscc" />
</g>
</svg>
diff --git a/src/activities/traffic/ActivityConfig.qml b/src/activities/traffic/ActivityConfig.qml
index 6a6401c50..ac4a103fd 100644
--- a/src/activities/traffic/ActivityConfig.qml
+++ b/src/activities/traffic/ActivityConfig.qml
@@ -1,60 +1,61 @@
/* GCompris - ActivityConfig.qml
*
* Copyright (C) 2019 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import "../../core"
Item {
id: activityConfiguration
property Item background
property alias modeBox: modeBox
+ width: if(background) background.width
property var availableModes: [
{ "text": qsTr("Colors"), "value": "COLOR" },
{ "text": qsTr("Images"), "value": "IMAGE" }
]
Flow {
id: flow
spacing: 5
width: parent.width
GCComboBox {
id: modeBox
model: availableModes
background: activityConfiguration.background
label: qsTr("Select your mode")
}
}
property var dataToSave
function setDefaultValues() {
for(var i = 0 ; i < availableModes.length ; i ++) {
if(availableModes[i].value === dataToSave["mode"]) {
modeBox.currentIndex = i;
break;
}
}
}
function saveValues() {
var newMode = availableModes[modeBox.currentIndex].value;
dataToSave = {"mode": newMode};
}
}
diff --git a/src/activities/wordsgame/resource/default-en.json b/src/activities/wordsgame/resource/default-en.json
index 6b588f458..29fc2605a 100644
--- a/src/activities/wordsgame/resource/default-en.json
+++ b/src/activities/wordsgame/resource/default-en.json
@@ -1,1992 +1,1991 @@
{
"levels" : [
{
"level" : "1",
"sublevels" : "15",
"words" : [
"a",
"am",
"an",
"as",
"at",
"be",
"by",
"do",
"go",
"he",
"if",
"in",
"is",
"it",
"me",
"my",
"no",
"of",
"on",
"or",
"so",
"to",
"up",
"us",
"we",
"act",
"add",
"age",
"ago",
"aid",
"air",
"all",
"and",
"any",
"are",
"arm",
"art",
"ask",
"bad",
"bay",
"bed",
"beg",
"big",
"bit",
"bow",
"box",
"boy",
"but",
"buy",
"can",
"cap",
"car",
"con",
"cry",
"cup",
"cut",
"day",
"did",
"die",
"dog",
"dry",
"ear",
"eat",
"end",
"est",
"eye",
"far",
"fat",
"fee",
"few",
"fit",
"fly",
"for",
"get",
"got",
"gun",
"had",
"has",
"hat",
"her",
"him",
"his",
"hot",
"ice",
"ill",
"its",
"job",
"joy",
"law",
"lay",
"led",
"leg",
"let",
"lie",
"lip",
"lot",
"low",
"mad",
"man",
"may",
"men",
"met",
"new",
"nor",
"not",
"now",
"off",
"old",
"one",
"our",
"out",
"own",
"pay",
"per",
"put",
"ran",
"red",
"run",
"sad",
"saw",
"say",
"sea",
"see",
"set",
"she",
"sin",
"sit",
"six",
"sky",
"son",
"sum",
"sun",
"tax",
"tea",
"ten",
"the",
"too",
"top",
"try",
"two",
"use",
"van",
"war",
"was",
"way",
"who",
"why",
"win",
"wit",
"won",
"yes",
"you"
]
},
{
"level" : "2",
"sublevels" : "15",
"words" : [
"able",
"also",
"army",
"aunt",
"baby",
"back",
"ball",
"band",
"bank",
"bare",
"base",
"bear",
"beat",
"been",
"bent",
"best",
"bill",
"bird",
"blow",
"boat",
"body",
"bold",
"book",
"bore",
"born",
"both",
"busy",
"call",
"calm",
"came",
"camp",
"care",
"case",
"cast",
"cent",
"city",
"coat",
"cold",
"come",
"cool",
"copy",
"corn",
"cost",
"dare",
"dark",
"date",
"dawn",
"dead",
"deal",
"dear",
"deck",
"deep",
"dire",
"disk",
"does",
"done",
"dont",
"door",
"down",
"draw",
"drop",
"dull",
"dust",
"duty",
"each",
"ease",
"east",
"edge",
"else",
"even",
"ever",
"evil",
"face",
"fact",
"fail",
"fair",
"fall",
"fame",
"farm",
"fast",
"fate",
"fear",
"feel",
"feet",
"felt",
"file",
"fill",
"find",
"fine",
"fire",
"firm",
"fish",
"five",
"flat",
"fond",
"food",
"fool",
"foot",
"form",
"fort",
"four",
"free",
"from",
"full",
"gain",
"game",
"gate",
"gave",
"gift",
"girl",
"give",
"glad",
"goes",
"gold",
"gone",
"good",
"gray",
"grew",
- "grey",
"grow",
"hair",
"half",
"hall",
"hand",
"hard",
"harm",
"hate",
"have",
"head",
"held",
"help",
"here",
"hero",
"hide",
"high",
"hold",
"home",
"hope",
"host",
"hour",
"huge",
"hung",
"hurt",
"idea",
"into",
"iron",
"join",
"july",
"june",
"just",
"keep",
"kept",
"kill",
"kind",
"king",
"kiss",
"knee",
"knew",
"know",
"lack",
"lady",
"laid",
"lake",
"land",
"last",
"late",
"lead",
"left",
"less",
"lest",
"life",
"like",
"line",
"link",
"list",
"live",
"long",
"look",
"lose",
"loss",
"lost",
"loud",
"love",
"made",
"maid",
"main",
"make",
"many",
"mark",
"mass",
"meal",
"mean",
"meet",
"mere",
"mile",
"milk",
"mind",
"mine",
"moon",
"more",
"most",
"move",
"much",
"must",
"name",
"neck",
"need",
"news",
"next",
"nice",
"nine",
"none",
"nose",
"note",
"once",
"only",
"open",
"over",
"page",
"paid",
"pain",
"pair",
"pale",
"part",
"pass",
"past",
"path",
"paul",
"pity",
"plan",
"play",
"plus",
"poor",
"post",
"pour",
"pray",
"pure",
"race",
"rage",
"rain",
"rare",
"rate",
"read",
"real",
"rest",
"rich",
"ride",
"ring",
"rise",
"risk",
"road",
"rock",
"roof",
"room",
"rose",
"ruin",
"rule",
"safe",
"said",
"sail",
"sake",
"salt",
"same",
"sand",
"save",
"says",
"seat",
"seek",
"seem",
"seen",
"self",
"sell",
"send",
"sent",
"ship",
"shop",
"shot",
"show",
"sick",
"side",
"sign",
"sing",
"site",
"size",
"skin",
"slow",
"snow",
"soft",
"soil",
"sold",
"some",
"song",
"soon",
"sort",
"soul",
"spot",
"star",
"stay",
"step",
"stop",
"such",
"suit",
"sure",
"take",
"tale",
"talk",
"tall",
"task",
"tear",
"tell",
"text",
"than",
"that",
"them",
"then",
"they",
"thin",
"this",
"thus",
"till",
"time",
"told",
"tone",
"town",
"tree",
"true",
"turn",
"type",
"unto",
"upon",
"used",
"vain",
"vast",
"very",
"view",
"wait",
"walk",
"wall",
"want",
"warm",
"weak",
"wear",
"week",
"well",
"went",
"were",
"what",
"when",
"whom",
"wife",
"wild",
"will",
"wind",
"wine",
"wise",
"wish",
"with",
"wood",
"word",
"work",
"year",
"your"
]
},
{
"level" : "3",
"sublevels" : "15",
"words" : [
"about",
"above",
"admit",
"after",
"again",
"agree",
"ahead",
"alike",
"alive",
"allow",
"alone",
"along",
"among",
"anger",
"angry",
"apart",
"apply",
"april",
"arise",
"aside",
"avoid",
"aware",
"awful",
"based",
"began",
"begin",
"being",
"below",
"birth",
"black",
"blame",
"blind",
"blood",
"board",
"bound",
"bowed",
"brain",
"brave",
"bread",
"break",
"brief",
"bring",
"broke",
"brown",
"built",
"burst",
"carry",
"catch",
"cause",
"chair",
"charm",
"check",
"chief",
"china",
"chose",
"civil",
"claim",
"class",
"clean",
"clear",
"close",
"cloth",
"cloud",
"coast",
"color",
"could",
"count",
"court",
"cover",
"cried",
"crime",
"cross",
"cruel",
"dance",
"dared",
"david",
"death",
"delay",
"doing",
"doubt",
"dozen",
"drawn",
"dream",
"dress",
"drink",
"dying",
"eager",
"early",
"earth",
"eight",
"empty",
"enemy",
"enjoy",
"enter",
"equal",
"error",
"event",
"every",
"exact",
"exist",
"faint",
"faith",
"false",
"fancy",
"fatal",
"fault",
"favor",
"field",
"fifty",
"fight",
"final",
"first",
"fixed",
"flame",
"fleet",
"flesh",
"floor",
"force",
"forth",
"forty",
"found",
"fresh",
"front",
"fruit",
"fully",
"given",
"glass",
"glory",
"going",
"goods",
"grace",
"grand",
"grass",
"grave",
"great",
"green",
"grief",
"group",
"guard",
"guess",
"guide",
"habit",
"happy",
"heard",
"heart",
"heavy",
"hence",
"honor",
"hoped",
"hopes",
"horse",
"hotel",
"house",
"human",
"image",
"india",
"issue",
"judge",
"known",
"knows",
"labor",
"large",
"later",
"laugh",
"least",
"leave",
"legal",
"light",
"local",
"loose",
"lover",
"lower",
"march",
"meant",
"mercy",
"midst",
"might",
"money",
"month",
"moral",
"mouth",
"music",
"needs",
"never",
"night",
"noble",
"noise",
"north",
"offer",
"often",
"order",
"other",
"ought",
"owner",
"paper",
"party",
"pause",
"peace",
"place",
"plain",
"plant",
"point",
"pound",
"power",
"press",
"price",
"pride",
"print",
"proof",
"proud",
"prove",
"queen",
"quick",
"quiet",
"quite",
"raise",
"range",
"rapid",
"reach",
"ready",
"reign",
"reply",
"right",
"river",
"rough",
"round",
"royal",
"saved",
"scene",
"seems",
"sense",
"serve",
"seven",
"shade",
"shame",
"shape",
"share",
"sharp",
"sheep",
"shore",
"short",
"shout",
"shown",
"sight",
"since",
"skill",
"slave",
"sleep",
"small",
"smile",
"smoke",
"sorry",
"sound",
"south",
"space",
"spare",
"speak",
"speed",
"spent",
"spite",
"staff",
"stage",
"stand",
"start",
"state",
"stick",
"still",
"stock",
"stone",
"stood",
"store",
"storm",
"story",
"study",
"style",
"sugar",
"sweet",
"sword",
"table",
"taste",
"teach",
"terms",
"their",
"there",
"these",
"thick",
"thing",
"think",
"third",
"those",
"three",
"throw",
"tired",
"title",
"total",
"touch",
"trade",
"train",
"trial",
"tried",
"truly",
"trust",
"truth",
"twice",
"uncle",
"under",
"until",
"upper",
"urged",
"usual",
"verse",
"visit",
"voice",
"waste",
"watch",
"water",
"weary",
"where",
"which",
"while",
"white",
"whole",
"whose",
"woman",
"women",
"world",
"worse",
"worst",
"worth",
"would",
"wound",
"write",
"wrong",
"wrote",
"young",
"yours",
"youth"
]
},
{
"level" : "4",
"sublevels" : "15",
"words" : [
"abroad",
"accept",
"access",
"across",
"action",
"active",
"actual",
"advice",
"afford",
"afraid",
"agreed",
"almost",
"always",
"amount",
"animal",
"answer",
"anyone",
"appeal",
"appear",
"around",
"arthur",
"artist",
"attack",
"attend",
"august",
"author",
"battle",
"beauty",
"became",
"become",
"before",
"begged",
"behind",
"behold",
"belief",
"belong",
"beside",
"better",
"beyond",
"bitter",
"bottom",
"bought",
"branch",
"breast",
"breath",
"bright",
"broken",
"buried",
"cannot",
"career",
"castle",
"caught",
"ceased",
- "centre",
+ "center",
"chance",
"change",
"charge",
"choose",
"church",
"circle",
"cities",
"colour",
"common",
"comply",
"corner",
"couple",
"course",
"cousin",
"credit",
"custom",
"degree",
"demand",
"desert",
"design",
"desire",
"dinner",
"direct",
"divine",
"doctor",
"domain",
"donate",
"double",
"during",
"easily",
"effect",
"effort",
"either",
"energy",
"enough",
"entire",
"escape",
"estate",
"except",
"excuse",
"expect",
"extent",
"fairly",
"family",
"famous",
"father",
"favour",
"fellow",
"female",
"fierce",
"figure",
"finger",
"flight",
"flower",
"follow",
"forest",
"forget",
"forgot",
"formed",
"former",
"fourth",
"freely",
"french",
"friend",
"garden",
"genius",
"gentle",
"gently",
"giving",
"glance",
"golden",
"ground",
"growth",
"guests",
"guilty",
"happen",
"hardly",
"having",
"health",
"heaven",
"higher",
"highly",
"holder",
"honest",
"honour",
"horror",
"humble",
"indeed",
"indian",
"island",
"kindly",
"labour",
"ladies",
"lately",
"latter",
"length",
"letter",
"lifted",
"likely",
"listen",
"little",
"living",
"longer",
"lovely",
"making",
"manner",
"marked",
"market",
"master",
"matter",
"medium",
"member",
"memory",
"mental",
"merely",
"method",
"middle",
"mighty",
"minute",
"misery",
"modern",
"moment",
"mother",
"motion",
"moving",
"murder",
"myself",
"narrow",
"nation",
"native",
"nature",
"nearer",
"nearly",
"notice",
"number",
"object",
"obtain",
"office",
"origin",
"pardon",
"partly",
"passed",
"paused",
"paying",
"people",
"period",
"person",
"phrase",
"picked",
"placed",
"places",
"please",
"plenty",
"pocket",
"police",
"policy",
"posted",
"praise",
"prayer",
"pretty",
"priest",
"prince",
"prison",
"profit",
"proper",
"proved",
"pushed",
"rather",
"reader",
"really",
"reason",
"record",
"refund",
"refuse",
"region",
"regret",
"relief",
"remain",
"remark",
"remove",
"render",
"report",
"result",
"return",
"reward",
"rushed",
"sacred",
"safety",
"savage",
"saying",
"school",
"search",
"season",
"second",
"secret",
"secure",
"seeing",
"seemed",
"seldom",
"series",
"severe",
"shadow",
"should",
"showed",
"silent",
"silver",
"simple",
"simply",
"single",
"sister",
"slight",
"slowly",
"smiled",
"social",
"softly",
"sooner",
"sought",
"source",
"speech",
"spirit",
"spoken",
"spread",
"spring",
"square",
"stairs",
"status",
"stream",
"street",
"strong",
"sudden",
"suffer",
"summer",
"supply",
"surely",
"system",
"taking",
"taught",
"temper",
"temple",
"tender",
"terror",
"thanks",
"theory",
"thirty",
"though",
"throat",
"tongue",
"toward",
"troops",
"trying",
"turned",
"twelve",
"twenty",
"unable",
"unless",
"useful",
"utmost",
"valley",
"volume",
"voyage",
"waited",
"walked",
"wealth",
"weight",
"whence",
"whilst",
"wholly",
"wicked",
"window",
"winter",
"wisdom",
"wished",
"within",
"wonder",
"writer",
"yellow"
]
},
{
"level" : "5",
"sublevels" : "15",
"words" : [
"absence",
"absolute",
"absolutely",
"according",
"account",
"actually",
"addition",
"additional",
"address",
"admiration",
"advance",
"advantage",
"affection",
"afternoon",
"afterwards",
"against",
"agreeable",
"agreement",
"already",
"although",
"altogether",
"amongst",
"ancient",
"another",
"anxiety",
"anxious",
"anybody",
"anything",
"anywhere",
"apparently",
"appearance",
"applicable",
"approach",
"approaching",
"argument",
"article",
"articles",
"ashamed",
"assistance",
"associated",
"assured",
"atmosphere",
"attached",
"attempt",
"attention",
"attitude",
"audience",
"authority",
"bearing",
"beautiful",
"because",
"becomes",
"becoming",
"beginning",
"believe",
"belonged",
"beneath",
"benefit",
"besides",
"between",
"blessed",
"blockquote",
"breaking",
"british",
"brother",
"brothers",
"brought",
"building",
"burning",
"business",
"calling",
"capable",
"capital",
"captain",
"careful",
"carriage",
"catholic",
"celebrated",
"century",
"certain",
"certainly",
"chamber",
"chapter",
"character",
"charming",
"chiefly",
"children",
"chinese",
"christian",
"clearly",
"closely",
"collection",
"comfort",
"command",
"commercial",
"companion",
"company",
"complete",
"completely",
"compliance",
"computer",
"concerning",
"conclusion",
"condition",
"conduct",
"confidence",
"confusion",
"connection",
"conscience",
"conscious",
"consciousness",
"consent",
"consequence",
"consider",
"considerable",
"consideration",
"considered",
"constant",
"constantly",
"contact",
"contain",
"content",
"continue",
"control",
"conversation",
"copyright",
"country",
"courage",
"created",
"creature",
"crossed",
"curiosity",
"current",
"dangerous",
"darkness",
"daughter",
"december",
"decision",
"defective",
"delicate",
"delight",
"delighted",
"demanded",
"departure",
"despair",
"destroy",
"destroyed",
"destruction",
"determined",
"development",
"difference",
"different",
"difficult",
"direction",
"directly",
"discover",
"discovery",
"disease",
"disposed",
"disposition",
"distance",
"distant",
"distinct",
"distribute",
"distributing",
"distribution",
"division",
"doctrine",
"domestic",
"doubtless",
"drawing",
"dressed",
"earnest",
"edition",
"education",
"electronic",
"electronically",
"emotion",
"engaged",
"enthusiasm",
"entirely",
"entrance",
"equally",
"equipment",
"escaped",
"especially",
"eternal",
"evening",
"everybody",
"everything",
"everywhere",
"evidence",
"evident",
"evidently",
"exactly",
"example",
"excellent",
"excitement",
"exclaimed",
"exercise",
"existence",
"expected",
"expedition",
"expense",
"explain",
"explanation",
"express",
"expression",
"extraordinary",
"extreme",
"extremely",
"faithful",
"falling",
"familiar",
"farther",
"fashion",
"february",
"feeling",
"fifteen",
"finally",
"followed",
"following",
"foolish",
"forehead",
"foreign",
"forever",
"forgotten",
"formerly",
"fortune",
"forward",
"freedom",
"frequently",
"friendly",
"frightened",
"further",
"gathered",
"general",
"generally",
"generous",
"gentleman",
"gentlemen",
"getting",
"glorious",
"government",
"governor",
"gradually",
"greater",
"greatest",
"greatly",
"growing",
"handsome",
"happiness",
"hearing",
"herself",
"himself",
"history",
"holding",
"household",
"however",
"humanity",
"hundred",
"hurried",
"husband",
"ignorance",
"ignorant",
"imagination",
"imagine",
"immediate",
"immediately",
"immense",
"importance",
"important",
"impossible",
"impression",
"inclined",
"included",
"increase",
"indicate",
"individual",
"influence",
"information",
"informed",
"innocent",
"inquired",
"instance",
"instant",
"instantly",
"instead",
"intellectual",
"intelligence",
"intention",
"interest",
"interested",
"interrupted",
"invited",
"january",
"judgment",
"justice",
"kindness",
"kingdom",
"kitchen",
"knowing",
"knowledge",
"language",
"laughing",
"learned",
"learning",
"liability",
"liberty",
"library",
"license",
"likewise",
"limitation",
"limited",
"literary",
"looking",
"machine",
"majority",
"mankind",
"marriage",
"married",
"material",
"meaning",
"measure",
"meeting",
"melancholy",
"mention",
"message",
"michael",
"midnight",
"military",
"million",
"minister",
"miserable",
"mission",
"mistake",
"mistress",
"morning",
"mountain",
"mounted",
"movement",
"murmured",
"mystery",
"national",
"natural",
"naturally",
"necessary",
"necessity",
"neither",
"nothing",
"november",
"numerous",
"obliged",
"observe",
"occasion",
"occasionally",
"october",
"officer",
"official",
"opening",
"opinion",
"opportunity",
"opposite",
"opposition",
"ordinary",
"original",
"otherwise",
"ourselves",
"outside",
"painted",
"paragraph",
"particular",
"particularly",
"passage",
"passion",
"patience",
"patient",
"perfect",
"perfectly",
"perhaps",
"permanent",
"permission",
"personal",
"philosophy",
"physical",
"picture",
"plainly",
"pleasant",
"political",
"popular",
"portion",
"position",
"possess",
"possessed",
"possession",
"possible",
"powerful",
"practical",
"practice",
"precious",
"prepare",
"prepared",
"presence",
"present",
"presently",
"previous",
"principal",
"principle",
"prisoner",
"private",
"probable",
"probably",
"proceed",
"proceeded",
"process",
"produce",
"production",
"progress",
"promise",
"promised",
"properly",
"property",
"protection",
"provide",
"provided",
"provisions",
"punishment",
"purpose",
"putting",
"quality",
"quantity",
"quarter",
"question",
"quickly",
"quietly",
"rapidly",
"readily",
"reading",
"reality",
"reasonable",
"receive",
"received",
"receiving",
"reference",
"regular",
"related",
"relation",
"release",
"religion",
"religious",
"remarkable",
"remarked",
"remember",
"rendered",
"replacement",
"replied",
"reputation",
"request",
"require",
"resolution",
"resolved",
"respect",
"running",
"satisfaction",
"scarcely",
"scattered",
"science",
"sending",
"sentence",
"sentiment",
"separate",
"september",
"serious",
"servant",
"service",
"setting",
"several",
"shining",
"shoulder",
"silence",
"similar",
"singing",
"singular",
"sitting",
"situation",
"slavery",
"slightly",
"smiling",
"society",
"soldier",
"something",
"sometimes",
"somewhat",
"somewhere",
"speaking",
"special",
"species",
"spiritual",
"splendid",
"standing",
"station",
"stepped",
"strange",
"stranger",
"strength",
"strongly",
"subject",
"succeeded",
"success",
"successful",
"suddenly",
"sufficient",
"sufficiently",
"suggestion",
"support",
"suppose",
"supposed",
"surface",
"surprise",
"surprised",
"suspicion",
"sympathy",
"telling",
"terrible",
"themselves",
"therefore",
"thinking",
"thoroughly",
"thought",
"thousand",
"through",
"throughout",
"together",
"touched",
"treated",
"treatment",
"trembling",
"triumph",
"trouble",
"troubled",
"turning",
"understand",
"understanding",
"unfortunate",
"unhappy",
"unknown",
"valuable",
"variety",
"various",
"village",
"violence",
"violent",
"visible",
"volunteers",
"waiting",
"watched",
"watching",
"weakness",
"weather",
"welcome",
"whatever",
"whenever",
"whether",
"whispered",
"willing",
"without",
"witness",
"wondered",
"wonderful",
"working",
"wounded",
"writing",
"written",
"yesterday",
"younger"
]
},
{
"level" : "6",
"sublevels" : "15",
"words" : [
"abolishment",
"abolition",
"abstract",
"abundance",
"abundant",
"academic",
"accelerate",
"acceleration",
"accident",
"adjustment",
"agreement",
"amazing",
"amusement",
"approval",
"arrange",
"arrangement",
"balance",
"barrier",
- "behaviour",
+ "behavior",
"bicycle",
"biology",
"birdfarm",
"birdhouse",
"blanket",
"breakfast",
"breeze",
"brotherhood",
"bubble",
"camera",
"carpet",
"caution",
"celebrity",
"chemical",
"community",
"comparison",
"compete",
"competition",
"coworker",
"crystal",
"defender",
"dictionary",
"dinosaurs",
"discuss",
"discussion",
"efficient",
"elastic",
"elbow",
"elevator",
"engineer",
"enhance",
"enlarge",
"enlighten",
"enormous",
"entertain",
- "everwhere",
+ "everywhere",
"execute",
"eyelash",
"eyewear",
"factory",
"fascinate",
"fiddle",
"firecracker",
"fisherman",
"flowerpot",
"footpath",
"footprint",
"freeze",
"function",
"glacier",
"grammar",
"grammatical",
"gracious",
"graciously",
"graduate",
"grandfather",
"guideline",
"hammer",
"harbour",
"harmony",
"humour",
"impulse",
"industry",
"instrument",
"invention",
"impact",
"impacted",
"impactful",
"impatient",
"imperfect",
"jasmine",
"jewelry",
"jewels",
"jungle",
"knuckle",
"legend",
"legendary",
"lifestyle",
"lightning",
"limestone",
"literature",
"locality",
"luggage",
"marathon",
"matchbox",
"mathematics",
"mechanic",
"medicine",
"merchant",
"microscope",
"migrant",
"minority",
"mischief",
"monarch",
"musician",
"necklace",
"neighbour",
"nonviolent",
"northern",
"notorious",
"operation",
"ornament",
"orchard",
"ourself",
"ourselves",
"overcome",
"paperclip",
"perfection",
"policeman",
"positive",
"prevent",
"python",
"raspberry",
"recognise",
"recollect",
"register",
"replenish",
"reporter",
"resume",
"reverse",
"rubber",
"sample",
"seasonal",
"sidewalk",
"snowball",
"snowboard",
"snowboarding",
"snowflake",
"solution",
"songwriter",
"sorcerer",
"sorrow",
"sorrowful",
"sparrow",
"spelling",
"squirrel",
"stomach",
"straight",
"stretch",
"summary",
"supervise",
"survival",
"survive",
"symbol",
"symbolic",
"teaching",
"technology",
"teenager",
"telephone",
"television",
"tendency",
"thunder",
"tomorrow",
"transport",
"umbrella",
"unified",
"uniform",
"united",
"velocity",
"vertical",
"vessel",
"watchmaker",
"windfarm",
"windscreen",
"windshield",
"wingsuit",
"winning",
"worksheet",
"workshop",
"workspace",
"worship",
"worthwhile",
"yourself",
"yourselves"
]
}
],
"name" : "default-en",
"locale" : "en",
- "description" : "Default English (Canada)"
+ "description" : "Default English (American)"
}
diff --git a/src/activities/wordsgame/resource/default-en.json b/src/activities/wordsgame/resource/default-en_GB.json
similarity index 99%
copy from src/activities/wordsgame/resource/default-en.json
copy to src/activities/wordsgame/resource/default-en_GB.json
index 6b588f458..3bdaf5813 100644
--- a/src/activities/wordsgame/resource/default-en.json
+++ b/src/activities/wordsgame/resource/default-en_GB.json
@@ -1,1992 +1,1991 @@
{
"levels" : [
{
"level" : "1",
"sublevels" : "15",
"words" : [
"a",
"am",
"an",
"as",
"at",
"be",
"by",
"do",
"go",
"he",
"if",
"in",
"is",
"it",
"me",
"my",
"no",
"of",
"on",
"or",
"so",
"to",
"up",
"us",
"we",
"act",
"add",
"age",
"ago",
"aid",
"air",
"all",
"and",
"any",
"are",
"arm",
"art",
"ask",
"bad",
"bay",
"bed",
"beg",
"big",
"bit",
"bow",
"box",
"boy",
"but",
"buy",
"can",
"cap",
"car",
"con",
"cry",
"cup",
"cut",
"day",
"did",
"die",
"dog",
"dry",
"ear",
"eat",
"end",
"est",
"eye",
"far",
"fat",
"fee",
"few",
"fit",
"fly",
"for",
"get",
"got",
"gun",
"had",
"has",
"hat",
"her",
"him",
"his",
"hot",
"ice",
"ill",
"its",
"job",
"joy",
"law",
"lay",
"led",
"leg",
"let",
"lie",
"lip",
"lot",
"low",
"mad",
"man",
"may",
"men",
"met",
"new",
"nor",
"not",
"now",
"off",
"old",
"one",
"our",
"out",
"own",
"pay",
"per",
"put",
"ran",
"red",
"run",
"sad",
"saw",
"say",
"sea",
"see",
"set",
"she",
"sin",
"sit",
"six",
"sky",
"son",
"sum",
"sun",
"tax",
"tea",
"ten",
"the",
"too",
"top",
"try",
"two",
"use",
"van",
"war",
"was",
"way",
"who",
"why",
"win",
"wit",
"won",
"yes",
"you"
]
},
{
"level" : "2",
"sublevels" : "15",
"words" : [
"able",
"also",
"army",
"aunt",
"baby",
"back",
"ball",
"band",
"bank",
"bare",
"base",
"bear",
"beat",
"been",
"bent",
"best",
"bill",
"bird",
"blow",
"boat",
"body",
"bold",
"book",
"bore",
"born",
"both",
"busy",
"call",
"calm",
"came",
"camp",
"care",
"case",
"cast",
"cent",
"city",
"coat",
"cold",
"come",
"cool",
"copy",
"corn",
"cost",
"dare",
"dark",
"date",
"dawn",
"dead",
"deal",
"dear",
"deck",
"deep",
"dire",
"disk",
"does",
"done",
"dont",
"door",
"down",
"draw",
"drop",
"dull",
"dust",
"duty",
"each",
"ease",
"east",
"edge",
"else",
"even",
"ever",
"evil",
"face",
"fact",
"fail",
"fair",
"fall",
"fame",
"farm",
"fast",
"fate",
"fear",
"feel",
"feet",
"felt",
"file",
"fill",
"find",
"fine",
"fire",
"firm",
"fish",
"five",
"flat",
"fond",
"food",
"fool",
"foot",
"form",
"fort",
"four",
"free",
"from",
"full",
"gain",
"game",
"gate",
"gave",
"gift",
"girl",
"give",
"glad",
"goes",
"gold",
"gone",
"good",
- "gray",
"grew",
"grey",
"grow",
"hair",
"half",
"hall",
"hand",
"hard",
"harm",
"hate",
"have",
"head",
"held",
"help",
"here",
"hero",
"hide",
"high",
"hold",
"home",
"hope",
"host",
"hour",
"huge",
"hung",
"hurt",
"idea",
"into",
"iron",
"join",
"july",
"june",
"just",
"keep",
"kept",
"kill",
"kind",
"king",
"kiss",
"knee",
"knew",
"know",
"lack",
"lady",
"laid",
"lake",
"land",
"last",
"late",
"lead",
"left",
"less",
"lest",
"life",
"like",
"line",
"link",
"list",
"live",
"long",
"look",
"lose",
"loss",
"lost",
"loud",
"love",
"made",
"maid",
"main",
"make",
"many",
"mark",
"mass",
"meal",
"mean",
"meet",
"mere",
"mile",
"milk",
"mind",
"mine",
"moon",
"more",
"most",
"move",
"much",
"must",
"name",
"neck",
"need",
"news",
"next",
"nice",
"nine",
"none",
"nose",
"note",
"once",
"only",
"open",
"over",
"page",
"paid",
"pain",
"pair",
"pale",
"part",
"pass",
"past",
"path",
"paul",
"pity",
"plan",
"play",
"plus",
"poor",
"post",
"pour",
"pray",
"pure",
"race",
"rage",
"rain",
"rare",
"rate",
"read",
"real",
"rest",
"rich",
"ride",
"ring",
"rise",
"risk",
"road",
"rock",
"roof",
"room",
"rose",
"ruin",
"rule",
"safe",
"said",
"sail",
"sake",
"salt",
"same",
"sand",
"save",
"says",
"seat",
"seek",
"seem",
"seen",
"self",
"sell",
"send",
"sent",
"ship",
"shop",
"shot",
"show",
"sick",
"side",
"sign",
"sing",
"site",
"size",
"skin",
"slow",
"snow",
"soft",
"soil",
"sold",
"some",
"song",
"soon",
"sort",
"soul",
"spot",
"star",
"stay",
"step",
"stop",
"such",
"suit",
"sure",
"take",
"tale",
"talk",
"tall",
"task",
"tear",
"tell",
"text",
"than",
"that",
"them",
"then",
"they",
"thin",
"this",
"thus",
"till",
"time",
"told",
"tone",
"town",
"tree",
"true",
"turn",
"type",
"unto",
"upon",
"used",
"vain",
"vast",
"very",
"view",
"wait",
"walk",
"wall",
"want",
"warm",
"weak",
"wear",
"week",
"well",
"went",
"were",
"what",
"when",
"whom",
"wife",
"wild",
"will",
"wind",
"wine",
"wise",
"wish",
"with",
"wood",
"word",
"work",
"year",
"your"
]
},
{
"level" : "3",
"sublevels" : "15",
"words" : [
"about",
"above",
"admit",
"after",
"again",
"agree",
"ahead",
"alike",
"alive",
"allow",
"alone",
"along",
"among",
"anger",
"angry",
"apart",
"apply",
"april",
"arise",
"aside",
"avoid",
"aware",
"awful",
"based",
"began",
"begin",
"being",
"below",
"birth",
"black",
"blame",
"blind",
"blood",
"board",
"bound",
"bowed",
"brain",
"brave",
"bread",
"break",
"brief",
"bring",
"broke",
"brown",
"built",
"burst",
"carry",
"catch",
"cause",
"chair",
"charm",
"check",
"chief",
"china",
"chose",
"civil",
"claim",
"class",
"clean",
"clear",
"close",
"cloth",
"cloud",
"coast",
- "color",
+ "colour",
"could",
"count",
"court",
"cover",
"cried",
"crime",
"cross",
"cruel",
"dance",
"dared",
"david",
"death",
"delay",
"doing",
"doubt",
"dozen",
"drawn",
"dream",
"dress",
"drink",
"dying",
"eager",
"early",
"earth",
"eight",
"empty",
"enemy",
"enjoy",
"enter",
"equal",
"error",
"event",
"every",
"exact",
"exist",
"faint",
"faith",
"false",
"fancy",
"fatal",
"fault",
"favor",
"field",
"fifty",
"fight",
"final",
"first",
"fixed",
"flame",
"fleet",
"flesh",
"floor",
"force",
"forth",
"forty",
"found",
"fresh",
"front",
"fruit",
"fully",
"given",
"glass",
"glory",
"going",
"goods",
"grace",
"grand",
"grass",
"grave",
"great",
"green",
"grief",
"group",
"guard",
"guess",
"guide",
"habit",
"happy",
"heard",
"heart",
"heavy",
"hence",
"honor",
"hoped",
"hopes",
"horse",
"hotel",
"house",
"human",
"image",
"india",
"issue",
"judge",
"known",
"knows",
"labor",
"large",
"later",
"laugh",
"least",
"leave",
"legal",
"light",
"local",
"loose",
"lover",
"lower",
"march",
"meant",
"mercy",
"midst",
"might",
"money",
"month",
"moral",
"mouth",
"music",
"needs",
"never",
"night",
"noble",
"noise",
"north",
"offer",
"often",
"order",
"other",
"ought",
"owner",
"paper",
"party",
"pause",
"peace",
"place",
"plain",
"plant",
"point",
"pound",
"power",
"press",
"price",
"pride",
"print",
"proof",
"proud",
"prove",
"queen",
"quick",
"quiet",
"quite",
"raise",
"range",
"rapid",
"reach",
"ready",
"reign",
"reply",
"right",
"river",
"rough",
"round",
"royal",
"saved",
"scene",
"seems",
"sense",
"serve",
"seven",
"shade",
"shame",
"shape",
"share",
"sharp",
"sheep",
"shore",
"short",
"shout",
"shown",
"sight",
"since",
"skill",
"slave",
"sleep",
"small",
"smile",
"smoke",
"sorry",
"sound",
"south",
"space",
"spare",
"speak",
"speed",
"spent",
"spite",
"staff",
"stage",
"stand",
"start",
"state",
"stick",
"still",
"stock",
"stone",
"stood",
"store",
"storm",
"story",
"study",
"style",
"sugar",
"sweet",
"sword",
"table",
"taste",
"teach",
"terms",
"their",
"there",
"these",
"thick",
"thing",
"think",
"third",
"those",
"three",
"throw",
"tired",
"title",
"total",
"touch",
"trade",
"train",
"trial",
"tried",
"truly",
"trust",
"truth",
"twice",
"uncle",
"under",
"until",
"upper",
"urged",
"usual",
"verse",
"visit",
"voice",
"waste",
"watch",
"water",
"weary",
"where",
"which",
"while",
"white",
"whole",
"whose",
"woman",
"women",
"world",
"worse",
"worst",
"worth",
"would",
"wound",
"write",
"wrong",
"wrote",
"young",
"yours",
"youth"
]
},
{
"level" : "4",
"sublevels" : "15",
"words" : [
"abroad",
"accept",
"access",
"across",
"action",
"active",
"actual",
"advice",
"afford",
"afraid",
"agreed",
"almost",
"always",
"amount",
"animal",
"answer",
"anyone",
"appeal",
"appear",
"around",
"arthur",
"artist",
"attack",
"attend",
"august",
"author",
"battle",
"beauty",
"became",
"become",
"before",
"begged",
"behind",
"behold",
"belief",
"belong",
"beside",
"better",
"beyond",
"bitter",
"bottom",
"bought",
"branch",
"breast",
"breath",
"bright",
"broken",
"buried",
"cannot",
"career",
"castle",
"caught",
"ceased",
"centre",
"chance",
"change",
"charge",
"choose",
"church",
"circle",
"cities",
"colour",
"common",
"comply",
"corner",
"couple",
"course",
"cousin",
"credit",
"custom",
"degree",
"demand",
"desert",
"design",
"desire",
"dinner",
"direct",
"divine",
"doctor",
"domain",
"donate",
"double",
"during",
"easily",
"effect",
"effort",
"either",
"energy",
"enough",
"entire",
"escape",
"estate",
"except",
"excuse",
"expect",
"extent",
"fairly",
"family",
"famous",
"father",
"favour",
"fellow",
"female",
"fierce",
"figure",
"finger",
"flight",
"flower",
"follow",
"forest",
"forget",
"forgot",
"formed",
"former",
"fourth",
"freely",
"french",
"friend",
"garden",
"genius",
"gentle",
"gently",
"giving",
"glance",
"golden",
"ground",
"growth",
"guests",
"guilty",
"happen",
"hardly",
"having",
"health",
"heaven",
"higher",
"highly",
"holder",
"honest",
"honour",
"horror",
"humble",
"indeed",
"indian",
"island",
"kindly",
"labour",
"ladies",
"lately",
"latter",
"length",
"letter",
"lifted",
"likely",
"listen",
"little",
"living",
"longer",
"lovely",
"making",
"manner",
"marked",
"market",
"master",
"matter",
"medium",
"member",
"memory",
"mental",
"merely",
"method",
"middle",
"mighty",
"minute",
"misery",
"modern",
"moment",
"mother",
"motion",
"moving",
"murder",
"myself",
"narrow",
"nation",
"native",
"nature",
"nearer",
"nearly",
"notice",
"number",
"object",
"obtain",
"office",
"origin",
"pardon",
"partly",
"passed",
"paused",
"paying",
"people",
"period",
"person",
"phrase",
"picked",
"placed",
"places",
"please",
"plenty",
"pocket",
"police",
"policy",
"posted",
"praise",
"prayer",
"pretty",
"priest",
"prince",
"prison",
"profit",
"proper",
"proved",
"pushed",
"rather",
"reader",
"really",
"reason",
"record",
"refund",
"refuse",
"region",
"regret",
"relief",
"remain",
"remark",
"remove",
"render",
"report",
"result",
"return",
"reward",
"rushed",
"sacred",
"safety",
"savage",
"saying",
"school",
"search",
"season",
"second",
"secret",
"secure",
"seeing",
"seemed",
"seldom",
"series",
"severe",
"shadow",
"should",
"showed",
"silent",
"silver",
"simple",
"simply",
"single",
"sister",
"slight",
"slowly",
"smiled",
"social",
"softly",
"sooner",
"sought",
"source",
"speech",
"spirit",
"spoken",
"spread",
"spring",
"square",
"stairs",
"status",
"stream",
"street",
"strong",
"sudden",
"suffer",
"summer",
"supply",
"surely",
"system",
"taking",
"taught",
"temper",
"temple",
"tender",
"terror",
"thanks",
"theory",
"thirty",
"though",
"throat",
"tongue",
"toward",
"troops",
"trying",
"turned",
"twelve",
"twenty",
"unable",
"unless",
"useful",
"utmost",
"valley",
"volume",
"voyage",
"waited",
"walked",
"wealth",
"weight",
"whence",
"whilst",
"wholly",
"wicked",
"window",
"winter",
"wisdom",
"wished",
"within",
"wonder",
"writer",
"yellow"
]
},
{
"level" : "5",
"sublevels" : "15",
"words" : [
"absence",
"absolute",
"absolutely",
"according",
"account",
"actually",
"addition",
"additional",
"address",
"admiration",
"advance",
"advantage",
"affection",
"afternoon",
"afterwards",
"against",
"agreeable",
"agreement",
"already",
"although",
"altogether",
"amongst",
"ancient",
"another",
"anxiety",
"anxious",
"anybody",
"anything",
"anywhere",
"apparently",
"appearance",
"applicable",
"approach",
"approaching",
"argument",
"article",
"articles",
"ashamed",
"assistance",
"associated",
"assured",
"atmosphere",
"attached",
"attempt",
"attention",
"attitude",
"audience",
"authority",
"bearing",
"beautiful",
"because",
"becomes",
"becoming",
"beginning",
"believe",
"belonged",
"beneath",
"benefit",
"besides",
"between",
"blessed",
"blockquote",
"breaking",
"british",
"brother",
"brothers",
"brought",
"building",
"burning",
"business",
"calling",
"capable",
"capital",
"captain",
"careful",
"carriage",
"catholic",
"celebrated",
"century",
"certain",
"certainly",
"chamber",
"chapter",
"character",
"charming",
"chiefly",
"children",
"chinese",
"christian",
"clearly",
"closely",
"collection",
"comfort",
"command",
"commercial",
"companion",
"company",
"complete",
"completely",
"compliance",
"computer",
"concerning",
"conclusion",
"condition",
"conduct",
"confidence",
"confusion",
"connection",
"conscience",
"conscious",
"consciousness",
"consent",
"consequence",
"consider",
"considerable",
"consideration",
"considered",
"constant",
"constantly",
"contact",
"contain",
"content",
"continue",
"control",
"conversation",
"copyright",
"country",
"courage",
"created",
"creature",
"crossed",
"curiosity",
"current",
"dangerous",
"darkness",
"daughter",
"december",
"decision",
"defective",
"delicate",
"delight",
"delighted",
"demanded",
"departure",
"despair",
"destroy",
"destroyed",
"destruction",
"determined",
"development",
"difference",
"different",
"difficult",
"direction",
"directly",
"discover",
"discovery",
"disease",
"disposed",
"disposition",
"distance",
"distant",
"distinct",
"distribute",
"distributing",
"distribution",
"division",
"doctrine",
"domestic",
"doubtless",
"drawing",
"dressed",
"earnest",
"edition",
"education",
"electronic",
"electronically",
"emotion",
"engaged",
"enthusiasm",
"entirely",
"entrance",
"equally",
"equipment",
"escaped",
"especially",
"eternal",
"evening",
"everybody",
"everything",
"everywhere",
"evidence",
"evident",
"evidently",
"exactly",
"example",
"excellent",
"excitement",
"exclaimed",
"exercise",
"existence",
"expected",
"expedition",
"expense",
"explain",
"explanation",
"express",
"expression",
"extraordinary",
"extreme",
"extremely",
"faithful",
"falling",
"familiar",
"farther",
"fashion",
"february",
"feeling",
"fifteen",
"finally",
"followed",
"following",
"foolish",
"forehead",
"foreign",
"forever",
"forgotten",
"formerly",
"fortune",
"forward",
"freedom",
"frequently",
"friendly",
"frightened",
"further",
"gathered",
"general",
"generally",
"generous",
"gentleman",
"gentlemen",
"getting",
"glorious",
"government",
"governor",
"gradually",
"greater",
"greatest",
"greatly",
"growing",
"handsome",
"happiness",
"hearing",
"herself",
"himself",
"history",
"holding",
"household",
"however",
"humanity",
"hundred",
"hurried",
"husband",
"ignorance",
"ignorant",
"imagination",
"imagine",
"immediate",
"immediately",
"immense",
"importance",
"important",
"impossible",
"impression",
"inclined",
"included",
"increase",
"indicate",
"individual",
"influence",
"information",
"informed",
"innocent",
"inquired",
"instance",
"instant",
"instantly",
"instead",
"intellectual",
"intelligence",
"intention",
"interest",
"interested",
"interrupted",
"invited",
"january",
"judgment",
"justice",
"kindness",
"kingdom",
"kitchen",
"knowing",
"knowledge",
"language",
"laughing",
"learned",
"learning",
"liability",
"liberty",
"library",
- "license",
+ "licence",
"likewise",
"limitation",
"limited",
"literary",
"looking",
"machine",
"majority",
"mankind",
"marriage",
"married",
"material",
"meaning",
"measure",
"meeting",
"melancholy",
"mention",
"message",
"michael",
"midnight",
"military",
"million",
"minister",
"miserable",
"mission",
"mistake",
"mistress",
"morning",
"mountain",
"mounted",
"movement",
"murmured",
"mystery",
"national",
"natural",
"naturally",
"necessary",
"necessity",
"neither",
"nothing",
"november",
"numerous",
"obliged",
"observe",
"occasion",
"occasionally",
"october",
"officer",
"official",
"opening",
"opinion",
"opportunity",
"opposite",
"opposition",
"ordinary",
"original",
"otherwise",
"ourselves",
"outside",
"painted",
"paragraph",
"particular",
"particularly",
"passage",
"passion",
"patience",
"patient",
"perfect",
"perfectly",
"perhaps",
"permanent",
"permission",
"personal",
"philosophy",
"physical",
"picture",
"plainly",
"pleasant",
"political",
"popular",
"portion",
"position",
"possess",
"possessed",
"possession",
"possible",
"powerful",
"practical",
"practice",
"precious",
"prepare",
"prepared",
"presence",
"present",
"presently",
"previous",
"principal",
"principle",
"prisoner",
"private",
"probable",
"probably",
"proceed",
"proceeded",
"process",
"produce",
"production",
"progress",
"promise",
"promised",
"properly",
"property",
"protection",
"provide",
"provided",
"provisions",
"punishment",
"purpose",
"putting",
"quality",
"quantity",
"quarter",
"question",
"quickly",
"quietly",
"rapidly",
"readily",
"reading",
"reality",
"reasonable",
"receive",
"received",
"receiving",
"reference",
"regular",
"related",
"relation",
"release",
"religion",
"religious",
"remarkable",
"remarked",
"remember",
"rendered",
"replacement",
"replied",
"reputation",
"request",
"require",
"resolution",
"resolved",
"respect",
"running",
"satisfaction",
"scarcely",
"scattered",
"science",
"sending",
"sentence",
"sentiment",
"separate",
"september",
"serious",
"servant",
"service",
"setting",
"several",
"shining",
"shoulder",
"silence",
"similar",
"singing",
"singular",
"sitting",
"situation",
"slavery",
"slightly",
"smiling",
"society",
"soldier",
"something",
"sometimes",
"somewhat",
"somewhere",
"speaking",
"special",
"species",
"spiritual",
"splendid",
"standing",
"station",
"stepped",
"strange",
"stranger",
"strength",
"strongly",
"subject",
"succeeded",
"success",
"successful",
"suddenly",
"sufficient",
"sufficiently",
"suggestion",
"support",
"suppose",
"supposed",
"surface",
"surprise",
"surprised",
"suspicion",
"sympathy",
"telling",
"terrible",
"themselves",
"therefore",
"thinking",
"thoroughly",
"thought",
"thousand",
"through",
"throughout",
"together",
"touched",
"treated",
"treatment",
"trembling",
"triumph",
"trouble",
"troubled",
"turning",
"understand",
"understanding",
"unfortunate",
"unhappy",
"unknown",
"valuable",
"variety",
"various",
"village",
"violence",
"violent",
"visible",
"volunteers",
"waiting",
"watched",
"watching",
"weakness",
"weather",
"welcome",
"whatever",
"whenever",
"whether",
"whispered",
"willing",
"without",
"witness",
"wondered",
"wonderful",
"working",
"wounded",
"writing",
"written",
"yesterday",
"younger"
]
},
{
"level" : "6",
"sublevels" : "15",
"words" : [
"abolishment",
"abolition",
"abstract",
"abundance",
"abundant",
"academic",
"accelerate",
"acceleration",
"accident",
"adjustment",
"agreement",
"amazing",
"amusement",
"approval",
"arrange",
"arrangement",
"balance",
"barrier",
"behaviour",
"bicycle",
"biology",
"birdfarm",
"birdhouse",
"blanket",
"breakfast",
"breeze",
"brotherhood",
"bubble",
"camera",
"carpet",
"caution",
"celebrity",
"chemical",
"community",
"comparison",
"compete",
"competition",
"coworker",
"crystal",
"defender",
"dictionary",
"dinosaurs",
"discuss",
"discussion",
"efficient",
"elastic",
"elbow",
"elevator",
"engineer",
"enhance",
"enlarge",
"enlighten",
"enormous",
"entertain",
- "everwhere",
+ "everywhere",
"execute",
"eyelash",
"eyewear",
"factory",
"fascinate",
"fiddle",
"firecracker",
"fisherman",
"flowerpot",
"footpath",
"footprint",
"freeze",
"function",
"glacier",
"grammar",
"grammatical",
"gracious",
"graciously",
"graduate",
"grandfather",
"guideline",
"hammer",
"harbour",
"harmony",
"humour",
"impulse",
"industry",
"instrument",
"invention",
"impact",
"impacted",
"impactful",
"impatient",
"imperfect",
"jasmine",
"jewelry",
"jewels",
"jungle",
"knuckle",
"legend",
"legendary",
"lifestyle",
"lightning",
"limestone",
"literature",
"locality",
"luggage",
"marathon",
"matchbox",
"mathematics",
"mechanic",
"medicine",
"merchant",
"microscope",
"migrant",
"minority",
"mischief",
"monarch",
"musician",
"necklace",
"neighbour",
"nonviolent",
"northern",
"notorious",
"operation",
"ornament",
"orchard",
"ourself",
"ourselves",
"overcome",
"paperclip",
"perfection",
"policeman",
"positive",
"prevent",
"python",
"raspberry",
"recognise",
"recollect",
"register",
"replenish",
"reporter",
"resume",
"reverse",
"rubber",
"sample",
"seasonal",
"sidewalk",
"snowball",
"snowboard",
"snowboarding",
"snowflake",
"solution",
"songwriter",
"sorcerer",
"sorrow",
"sorrowful",
"sparrow",
"spelling",
"squirrel",
"stomach",
"straight",
"stretch",
"summary",
"supervise",
"survival",
"survive",
"symbol",
"symbolic",
"teaching",
"technology",
"teenager",
"telephone",
"television",
"tendency",
"thunder",
"tomorrow",
"transport",
"umbrella",
"unified",
"uniform",
"united",
"velocity",
"vertical",
"vessel",
"watchmaker",
"windfarm",
"windscreen",
"windshield",
"wingsuit",
"winning",
"worksheet",
"workshop",
"workspace",
"worship",
"worthwhile",
"yourself",
"yourselves"
]
}
],
- "name" : "default-en",
- "locale" : "en",
- "description" : "Default English (Canada)"
+ "name" : "default-en_GB",
+ "locale" : "en_GB",
+ "description" : "Default English (British)"
}
diff --git a/src/activities/wordsgame/resource/default-mk.json b/src/activities/wordsgame/resource/default-mk.json
new file mode 100644
index 000000000..a5bd0fdb6
--- /dev/null
+++ b/src/activities/wordsgame/resource/default-mk.json
@@ -0,0 +1,196 @@
+{
+ "levels": [
+ {
+ "level": "1",
+ "sublevels": "15",
+ "words": [
+ "топка",
+ "со",
+ "шапка",
+ "и",
+ "или",
+ "после",
+ "фарма",
+ "кола",
+ "тркало",
+ "птица",
+ "пат",
+ "негово",
+ "нејзино",
+ "чаша",
+ "брз",
+ "лет",
+ "види",
+ "само",
+ "лесно",
+ "љубов",
+ "забава",
+ "див",
+ "почеток",
+ "скок",
+ "имам",
+ "куче",
+ "маче",
+ "крава",
+ "книга",
+ "буква",
+ "црвено",
+ "зелено",
+ "сино",
+ "мое",
+ "суво"
+ ]
+ },
+ {
+ "level": "2",
+ "sublevels": "15",
+ "words": [
+ "љубов",
+ "ученик",
+ "препродавач",
+ "маржа",
+ "странство",
+ "живот",
+ "замок",
+ "слобода",
+ "планина",
+ "ропство",
+ "фактор",
+ "ситуација",
+ "коњ",
+ "коњак",
+ "коњаница",
+ "височина",
+ "знаење",
+ "поддршка",
+ "езеро",
+ "компјутер",
+ "музика",
+ "звук",
+ "цвет",
+ "чудесно",
+ "власт",
+ "сон",
+ "училиште",
+ "гостин",
+ "тежок",
+ "игра"
+ ]
+ },
+ {
+ "level": "3",
+ "sublevels": "15",
+ "words": [
+ "борчлија",
+ "барабанџија",
+ "горештина",
+ "еќим",
+ "солидарност",
+ "зијан",
+ "кадија",
+ "марифет",
+ "оџа",
+ "аџилак",
+ "раја",
+ "саѓи",
+ "хајка",
+ "хармоничност",
+ "харпун",
+ "харфа",
+ "џавкање",
+ "ќар",
+ "ќебап",
+ "ќебе",
+ "ќерамида",
+ "ќелија",
+ "тамбураш",
+ "тутунџија",
+ "тужба",
+ "љубезност",
+ "ѓеврек",
+ "ѓердан",
+ "печиво",
+ "жаба",
+ "желка",
+ "жед",
+ "желудник",
+ "ориз",
+ "оружје",
+ "нож",
+ "ножица",
+ "нечистотија",
+ "нишка",
+ "ѕвонче",
+ "ѕвезда",
+ "ѕвонар",
+ "ѕуница",
+ "исток",
+ "игла",
+ "џем",
+ "џамлии",
+ "ѓезве",
+ "ашов",
+ "сеир",
+ "студент",
+ "тапија",
+ "антилопа",
+ "леопард",
+ "фереџе",
+ "ќор-сокак",
+ "мрежа",
+ "октопод",
+ "јагненце",
+ "кокошка",
+ "танц",
+ "стапка",
+ "баждарина",
+ "скулптура",
+ "театар",
+ "опера",
+ "концерт",
+ "лагер",
+ "независност",
+ "обврзник",
+ "достоинство",
+ "чест",
+ "семејство",
+ "празник",
+ "карикатура",
+ "ловец",
+ "рибар",
+ "машина",
+ "кораб",
+ "понекогаш",
+ "град",
+ "невозможно",
+ "штрк",
+ "чалма",
+ "едрилица",
+ "подморница",
+ "исцелител",
+ "доброволец",
+ "придонес",
+ "преведувач",
+ "игралиште",
+ "полјана",
+ "колиба",
+ "неразделни",
+ "катанец",
+ "џам",
+ "зеленчук",
+ "краставица",
+ "кокошарник",
+ "амбар",
+ "вистина",
+ "правда",
+ "писмен",
+ "шајка",
+ "чизми",
+ "полн",
+ "чист"
+ ]
+ }],
+ "name": "default-mk",
+ "locale": "mk",
+ "description": "Default Macedonian"
+}
\ No newline at end of file
diff --git a/src/activityintro2msg.awk b/src/activityintro2msg.awk
new file mode 100644
index 000000000..db855230b
--- /dev/null
+++ b/src/activityintro2msg.awk
@@ -0,0 +1,6 @@
+match($0, /intro:[[:blank:]]+/) {
+ split(FILENAME, paths, "/")
+ printf "// i18n: file: %s:%d\n", FILENAME, NR
+ printf "//i18n: intro voices, see GCompris-voices/README.md - activity: \"%s\"\n", paths[3]
+ printf "i18n(%s);\n", substr($0, RSTART+RLENGTH)
+}
diff --git a/src/core/ActivityBase.qml b/src/core/ActivityBase.qml
index ac1ca1241..dad20b452 100644
--- a/src/core/ActivityBase.qml
+++ b/src/core/ActivityBase.qml
@@ -1,292 +1,303 @@
/* GCompris - ActivityBase.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
import "qrc:/gcompris/src/core/core.js" as Core
/**
* The base QML component for activities in GCompris.
* @ingroup components
*
* Each activity should be derived from this component. It is responsible for
*
* * basic common key handling,
* * unified audio handling,
* * screen switching dynamics (from/to Menu/DialogHelp/etc.)
*
* The following common keys are handled so far:
*
* * @c Ctrl+q: Exit the application.
* * @c Ctrl+b: Toggle the bar.
* * @c Ctrl+f: Toggle fullscreen.
* * @c Ctrl+m: Toggle audio effects.
* * @c Ctrl+w: Exit the current activity and return to the menu.
* * @c Ctrl+p: Make a screenshot.
* * @c Back: Return to the home screen (corresponds to the 'Back' button on
* Android).
*
* Cf. Template.qml for a sample skeleton activity.
*
* Cf.
* [the wiki](https://gcompris.net/wiki/Qt_Quick_development_process#Adding_a_new_activity)
* for further information about creating a new activity.
*
* @inherit QtQuick.Item
*/
Item {
id: page
/**
* type:Item
* Parent object.
*/
property Item main: parent;
/**
* type:Component
* The top-level component containing the visible viewport of an activity.
*
* Put all you want to present the user into this container. Mostly
* implemented using a Rectangle or Image component, itself
* containing further graphical elements. You are pretty free of doing
* whatever you want inside this component.
*
* Also common elements as Bar, Score, DialogHelp, etc. should be placed
* inside this element.
*/
property Component pageComponent
/**
* type:QtObject
* Reference to the menu activity.
*
* Populated automatically during activity-loading.
*/
property QtObject menu
/**
* type:QtObject
* Reference to the ActivityInfo object of the activity.
*
* Populated automatically during activity-loading.
*/
property QtObject activityInfo
/**
* type:GCAudio
* The global audio item for voices.
*
* Because of problems synchronizing multiple Audio objects between
* global/menu/main and individual activities, activities should refrain
* from implementing additional Audio elements.
*
* Instead append to this global object to play your voices after the
* intro music.
* @sa GCAudio audioVoices
*/
property GCAudio audioVoices
/**
* type:GCSfx
* The global audio item for audio effects.
*
* Use it to play your effects.
* @sa GCSfx audioEffects
*/
property GCSfx audioEffects
/**
- * type:Loading
- * The global loading object.
+ * type:GCAudio
+ * The global audio item for background music.
*
- * Start it to signal heavy computation in case of GUI freezes.
- * @sa Loading
+ * @sa GCAudio backgroundMusic
*/
- property Loading loading
+ property GCAudio backgroundMusic
/**
* type:string
* The resource folder for the current activity. The resources
* of each activity needs to be stored with the same pattern.
* "qrc:/gcompris/src/activities/" + activity name + "/resource/"
*
*/
property string resourceUrl: (activityInfo && activityInfo.name) ? "qrc:/gcompris/src/activities/" + activityInfo.name.split('/')[0] + "/resource/": ""
/**
* type: bool
- * This variable stores if the activity is a musical activity.
+ * It tells whether the activity is a musical activity or not(if the activity contains it's own audio effects).
*
- * If it is a musical activity and the audioEffects is disabled, we temporarily unmute the GCSfx audioEffects for that activity and mute again on exiting it in main.qml.
+ * If the activity is a musical activity, on starting it the background music pauses and when the activity is quit, background music resumes.
+ *
+ * Set it as true if the activity is musical.
*/
property bool isMusicalActivity: false
property alias datasetLoader: datasetLoader
property var levelFolder
+ /**
+ * type:Loading
+ * The global loading object.
+ *
+ * Start it to signal heavy computation in case of GUI freezes.
+ * @sa Loading
+ */
+ property Loading loading
+
/**
* Emitted when the user wants to return to the Home/Menu screen.
*/
signal home
/**
* Emitted when the user wants to return several views back in the
* page stack.
*/
signal back(Item to)
/**
* Emitted every time the activity has been started.
*
* Initialize your activity upon this signal.
*/
signal start
/**
* Emitted when the activity is about to stop
*
* Shutdown whatever you need to upon this signal.
*/
signal stop
/**
* Emitted when dialog @p dialog should be shown
*
* Emit this signal when you want to show another dialog, e.g. on
* Bar.onHelpClicked
*
* @param dialog Dialog to show.
*/
signal displayDialog(Item dialog)
/**
* Emitted when multiple @p dialogs should be pushed on the page-stack
*
* Emit this signal when you want to stack >1 views. The last one will be
* shown the intermediated ones will be kept on the page stack for later
* pop() calls.
*
* @param dialogs Array of dialogs to push;
*/
signal displayDialogs(var dialogs)
onBack: menu ? menu.back(to) : ""
onHome: menu ? menu.home() : ""
onDisplayDialog: menu ? menu.displayDialog(dialog) : ""
onDisplayDialogs: menu ? menu.displayDialogs(dialogs) : ""
Keys.forwardTo: activity.children
Keys.onEscapePressed: home();
Keys.onPressed: {
if (event.modifiers === Qt.ControlModifier &&
event.key === Qt.Key_Q) {
// Ctrl+Q exit the application
Core.quit(main);
} else if (event.modifiers === Qt.ControlModifier &&
event.key === Qt.Key_B) {
// Ctrl+B toggle the bar
ApplicationSettings.isBarHidden = !ApplicationSettings.isBarHidden;
} else if (event.modifiers === Qt.ControlModifier &&
event.key === Qt.Key_F) {
// Ctrl+F toggle fullscreen
ApplicationSettings.isFullscreen = !ApplicationSettings.isFullscreen
} else if (event.modifiers === Qt.ControlModifier &&
event.key === Qt.Key_M) {
// Ctrl+M toggle sound
// We mute / unmute both channels in sync
ApplicationSettings.isAudioVoicesEnabled = !ApplicationSettings.isAudioVoicesEnabled
- ApplicationSettings.isAudioEffectsEnabled = !ApplicationSettings.isAudioEffectsEnabled
+ ApplicationSettings.isAudioEffectsEnabled = ApplicationSettings.isAudioVoicesEnabled
+ ApplicationSettings.isBackgroundMusicEnabled = ApplicationSettings.isAudioVoicesEnabled
} else if (event.modifiers === Qt.ControlModifier &&
event.key === Qt.Key_W) {
// Ctrl+W exit the current activity
home()
} else if (event.modifiers === Qt.ControlModifier &&
event.key === Qt.Key_P) {
// Ctrl+P Screenshot
ApplicationInfo.screenshot("/tmp/" + activityInfo.name.split('/')[0] + ".png")
}
}
Keys.onReleased: {
if (event.key === Qt.Key_Back) {
event.accepted = true
home()
}
}
Loader {
id: activity
sourceComponent: pageComponent
anchors.fill: parent
}
Loader {
id: demoPageLoader
source: ApplicationSettings.activationMode == 1 ?
"BuyMeOverlayInapp.qml" : "BuyMeOverlay.qml"
anchors.fill: parent
active: !activityInfo.demo && ApplicationSettings.isDemoMode
}
onLevelFolderChanged: {
if(levelFolder === undefined || levelFolder.length === 0) {
return
}
datasetLoader.data = []
levelFolder.sort()
for(var level in levelFolder) {
datasetLoader.dataFiles.push({"file": resourceUrl+levelFolder[level]+"/Data.qml"})
}
datasetLoader.start()
}
Loader {
id: datasetLoader
asynchronous: false
property var dataFiles: []
property var currentFile
property var data: []
signal start
signal stop
onStart: {
var file = dataFiles.shift()
currentFile = file
source = file.file.toString()
}
onLoaded: {
data = data.concat(item.data)
if(dataFiles.length != 0) {
start()
}
else {
stop()
}
}
onStop: {
//print("stop", JSON.stringify(data))
source = ""
// Core.shuffle(data) do we want to shuffle??? Should depend on the activity (if we want increasing levels) or teachers (random multiplication tables for example)
}
}
}
diff --git a/src/activities/note_names/AdvancedTimer.qml b/src/core/AdvancedTimer.qml
similarity index 88%
rename from src/activities/note_names/AdvancedTimer.qml
rename to src/core/AdvancedTimer.qml
index 7a0879cd8..8173a1b40 100644
--- a/src/activities/note_names/AdvancedTimer.qml
+++ b/src/core/AdvancedTimer.qml
@@ -1,73 +1,70 @@
/* GCompris - AdvancedTimer.qml
*
* Copyright (C) 2018 Aman Kumar Gupta <gupta2140@gmail.com>
*
* Authors:
* Aman Kumar Gupta <gupta2140@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
-import QtQuick.Controls 1.5
import GCompris 1.0
-import "note_names.js" as Activity
Timer {
id: timer
property double startTime
property double pauseTime
- property int timerNormalInterval: 2700
property int remainingInterval
- interval: timerNormalInterval
+ interval: activity.timerNormalInterval
signal pause
signal resume
signal restart
onPause: {
if(timer.running) {
pauseTime = new Date().getTime()
timer.stop()
}
}
onResume: {
if(!timer.running) {
if(!triggeredOnStart) {
remainingInterval = Math.abs(timer.interval - Math.abs(pauseTime - startTime))
timer.interval = remainingInterval
}
timer.start()
}
}
onRestart: {
timer.stop()
timer.interval = 1
timer.start()
}
onTriggered:{
- if(interval != timerNormalInterval) {
- interval = timerNormalInterval
+ if(interval != activity.timerNormalInterval) {
+ interval = activity.timerNormalInterval
}
}
onRunningChanged: {
if(running)
startTime = new Date().getTime()
}
}
diff --git a/src/core/ApplicationInfo.cpp b/src/core/ApplicationInfo.cpp
index f2181a404..d4ee3a950 100644
--- a/src/core/ApplicationInfo.cpp
+++ b/src/core/ApplicationInfo.cpp
@@ -1,287 +1,296 @@
/* GCompris - ApplicationInfo.cpp
*
* Copyright (C) 2014-2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This file was originally created from Digia example code under BSD license
* and heavily modified since then.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include "ApplicationInfo.h"
#include <QtQml>
#include <QtMath>
#include <QUrl>
#include <QUrlQuery>
#include <QGuiApplication>
#include <QScreen>
#include <QLocale>
#include <QQuickWindow>
#include <QStandardPaths>
#include <QSensor>
#include <qmath.h>
#include <QDebug>
#include <QFontDatabase>
#include <QDir>
QQuickWindow *ApplicationInfo::m_window = nullptr;
ApplicationInfo *ApplicationInfo::m_instance = nullptr;
ApplicationInfo::ApplicationInfo(QObject *parent): QObject(parent)
{
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) || defined(Q_OS_BLACKBERRY) || defined(SAILFISHOS)
m_isMobile = true;
#else
m_isMobile = false;
#endif
#if defined(Q_OS_ANDROID)
// Put android before checking linux/unix as it is also a linux
m_platform = Android;
#elif defined(Q_OS_MAC)
m_platform = MacOSX;
#elif (defined(Q_OS_LINUX) || defined(Q_OS_UNIX))
m_platform = Linux;
#elif defined(Q_OS_WIN)
m_platform = Windows;
#elif defined(Q_OS_IOS)
m_platform = Ios;
#elif defined(Q_OS_BLACKBERRY)
m_platform = Blackberry;
#elif defined(SAILFISHOS)
m_platform = SailfishOS;
#else // default is Linux
m_platform = Linux;
#endif
m_isBox2DInstalled = false;
QRect rect = qApp->primaryScreen()->geometry();
m_ratio = qMin(qMax(rect.width(), rect.height())/800. , qMin(rect.width(), rect.height())/520.);
// calculate a factor for font-scaling, cf.
- // http://doc.qt.io/qt-5/scalability.html#calculating-scaling-ratio
+ // https://doc.qt.io/qt-5/scalability.html#calculating-scaling-ratio
qreal refDpi = 216.;
qreal refHeight = 1776.;
qreal refWidth = 1080.;
qreal height = qMax(rect.width(), rect.height());
qreal width = qMin(rect.width(), rect.height());
qreal dpi = qApp->primaryScreen()->logicalDotsPerInch();
m_fontRatio = qMax(qreal(1.0), qMin(height*refDpi/(dpi*refHeight), width*refDpi/(dpi*refWidth)));
m_isPortraitMode = m_isMobile ? rect.height() > rect.width() : false;
m_applicationWidth = m_isMobile ? rect.width() : 1120;
m_useOpenGL = true;
if (m_isMobile)
connect(qApp->primaryScreen(), &QScreen::physicalSizeChanged, this, &ApplicationInfo::notifyPortraitMode);
// @FIXME this does not work on iOS: https://bugreports.qt.io/browse/QTBUG-50624
#if !defined(Q_OS_IOS)
// Get all symbol fonts to remove them
QFontDatabase database;
m_excludedFonts = database.families(QFontDatabase::Symbol);
#endif
// Get fonts from rcc
const QStringList fontFilters = {"*.otf", "*.ttf"};
m_fontsFromRcc = QDir(":/gcompris/src/core/resource/fonts").entryList(fontFilters);
}
ApplicationInfo::~ApplicationInfo()
{
m_instance = nullptr;
}
bool ApplicationInfo::sensorIsSupported(const QString& sensorType)
{
return QSensor::sensorTypes().contains(sensorType.toUtf8());
}
Qt::ScreenOrientation ApplicationInfo::getNativeOrientation()
{
return QGuiApplication::primaryScreen()->nativeOrientation();
}
void ApplicationInfo::setApplicationWidth(const int newWidth)
{
if (newWidth != m_applicationWidth) {
m_applicationWidth = newWidth;
emit applicationWidthChanged();
}
}
QString ApplicationInfo::getResourceDataPath()
{
return QString("qrc:/gcompris/data");
}
QString ApplicationInfo::getFilePath(const QString &file)
{
#if defined(Q_OS_ANDROID)
return QString("assets:/share/GCompris/rcc/%1").arg(file);
#elif defined(Q_OS_MACX)
return QString("%1/../Resources/rcc/%2").arg(QCoreApplication::applicationDirPath(), file);
#elif defined(Q_OS_IOS)
return QString("%1/rcc/%2").arg(QCoreApplication::applicationDirPath(), file);
#else
return QString("%1/%2/rcc/%3").arg(QCoreApplication::applicationDirPath(), GCOMPRIS_DATA_FOLDER, file);
#endif
}
QString ApplicationInfo::getAudioFilePath(const QString &file)
{
QString localeName = getVoicesLocale(ApplicationSettings::getInstance()->locale());
return getAudioFilePathForLocale(file, localeName);
}
QString ApplicationInfo::getAudioFilePathForLocale(const QString &file,
const QString &localeName)
{
QString filename = file;
filename.replace("$LOCALE", localeName);
filename.replace("$CA", CompressedAudio());
if(file.startsWith('/') || file.startsWith(QLatin1String("qrc:")) || file.startsWith(':'))
return filename;
return getResourceDataPath() + '/' + filename;
}
QString ApplicationInfo::getLocaleFilePath(const QString &file)
{
QString localeShortName = localeShort();
QString filename = file;
filename.replace("$LOCALE", localeShortName);
return filename;
}
QStringList ApplicationInfo::getSystemExcludedFonts()
{
return m_excludedFonts;
}
QStringList ApplicationInfo::getFontsFromRcc()
{
return m_fontsFromRcc;
}
+QStringList ApplicationInfo::getBackgroundMusicFromRcc()
+{
+ const QStringList backgroundMusicFilters = { QString("*.%1").arg(COMPRESSED_AUDIO) };
+ m_backgroundMusicFromRcc = QDir(":/gcompris/data/backgroundMusic").entryList(backgroundMusicFilters);
+ return m_backgroundMusicFromRcc;
+}
+
void ApplicationInfo::notifyPortraitMode()
{
int width = qApp->primaryScreen()->geometry().width();
int height = qApp->primaryScreen()->geometry().height();
setIsPortraitMode(height > width);
}
void ApplicationInfo::setIsPortraitMode(const bool newMode)
{
if (m_isPortraitMode != newMode) {
m_isPortraitMode = newMode;
emit portraitModeChanged();
}
}
void ApplicationInfo::setWindow(QQuickWindow *window)
{
m_window = window;
}
void ApplicationInfo::screenshot(const QString &file)
{
QImage img = m_window->grabWindow();
img.save(file);
}
void ApplicationInfo::notifyFullscreenChanged()
{
if(ApplicationSettings::getInstance()->isFullscreen())
m_window->showFullScreen();
else
m_window->showNormal();
}
// Would be better to create a component importing Box2D 2.0 using QQmlContext and test if it exists but it does not work.
void ApplicationInfo::setBox2DInstalled(const QQmlEngine &engine) {
/*
QQmlContext *context = new QQmlContext(engine.rootContext());
context->setContextObject(&myDataSet);
QQmlComponent component(&engine);
component.setData("import QtQuick 2.0\nimport Box2D 2.0\nItem { }", QUrl());
component.create(context);
box2dInstalled = (component != nullptr);
*/
bool box2dInstalled = false;
for(const QString &folder: engine.importPathList()) {
if(QDir(folder).entryList().contains(QStringLiteral("Box2D.2.0"))) {
if(QDir(folder+"/Box2D.2.0").entryList().contains("qmldir")) {
qDebug() << "Found box2d in " << folder;
box2dInstalled = true;
break;
}
}
}
m_isBox2DInstalled = box2dInstalled;
emit isBox2DInstalledChanged();
}
// return the shortest possible locale name for the given locale, describing
// a unique voices dataset
QString ApplicationInfo::getVoicesLocale(const QString &locale)
{
QString _locale = locale;
if(_locale == GC_DEFAULT_LOCALE) {
_locale = QLocale::system().name();
if(_locale == "C")
_locale = "en_US";
}
// locales we have country-specific voices for:
- if (_locale.startsWith(QLatin1String("pt_BR")) ||
+ if (_locale.startsWith(QLatin1String("en_GB")) ||
+ _locale.startsWith(QLatin1String("en_US")) ||
+ _locale.startsWith(QLatin1String("pt_BR")) ||
_locale.startsWith(QLatin1String("zh_CN")) ||
_locale.startsWith(QLatin1String("zh_TW")))
return QLocale(_locale).name();
// short locale for all the rest:
return localeShort(_locale);
}
QVariantList ApplicationInfo::localeSort(QVariantList list,
const QString& locale) const
{
std::sort(list.begin(), list.end(),
[&locale,this](const QVariant& a, const QVariant& b) {
return (localeCompare(a.toString(), b.toString(), locale) < 0);
});
return list;
}
QObject *ApplicationInfo::applicationInfoProvider(QQmlEngine *engine,
QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
/*
* Connect the fullscreen change signal to applicationInfo in order to change
* the QQuickWindow value
*/
ApplicationInfo* appInfo = getInstance();
connect(ApplicationSettings::getInstance(), &ApplicationSettings::fullscreenChanged, appInfo,
&ApplicationInfo::notifyFullscreenChanged);
return appInfo;
}
diff --git a/src/core/ApplicationInfo.h b/src/core/ApplicationInfo.h
index 8c9adbac0..db0c7c08c 100644
--- a/src/core/ApplicationInfo.h
+++ b/src/core/ApplicationInfo.h
@@ -1,441 +1,445 @@
/* GCompris - ApplicationInfo.h
*
* Copyright (C) 2014-2015 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This file was originally created from Digia example code under BSD license
* and heavily modified since then.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#ifndef APPLICATIONINFO_H
#define APPLICATIONINFO_H
#include <config.h>
#include "ApplicationSettings.h"
#include <QObject>
#include <QQmlEngine>
#include <QtGlobal>
class QQuickWindow;
/**
* @class ApplicationInfo
* @short A general purpose singleton that exposes miscellaneous native
* functions to the QML layer.
* @ingroup infrastructure
*/
class ApplicationInfo : public QObject
{
Q_OBJECT
/**
* Width of the application viewport.
*/
Q_PROPERTY(int applicationWidth READ applicationWidth WRITE setApplicationWidth NOTIFY applicationWidthChanged)
/**
* Platform the application is currently running on.
*/
Q_PROPERTY(Platform platform READ platform CONSTANT)
/**
* Whether the application is currently running on a mobile platform.
*
* Mobile platforms are Android, Ios (not supported yet),
* Blackberry (not supported)
*/
Q_PROPERTY(bool isMobile READ isMobile CONSTANT)
/**
* Whether the current platform supports fragment shaders.
*
* This flag is used in some core modules to selectively deactivate
* particle effects which cause crashes on some Android devices.
*
* cf. https://bugreports.qt.io/browse/QTBUG-44194
*
* For now always set to false, to prevent crashes.
*/
Q_PROPERTY(bool hasShader READ hasShader CONSTANT)
/**
* Whether currently in portrait mode, on mobile platforms.
*
* Based on viewport geometry.
*/
Q_PROPERTY(bool isPortraitMode READ isPortraitMode WRITE setIsPortraitMode NOTIFY portraitModeChanged)
/**
* Ratio factor used for scaling of sizes on high-dpi devices.
*
* Must be used by activities as a scaling factor to all pixel values.
*/
Q_PROPERTY(qreal ratio READ ratio NOTIFY ratioChanged)
/**
* Ratio factor used for font scaling.
*
* On some low-dpi Android devices with high res (e.g. Galaxy Tab 4) the
* fonts in Text-like elements appear too small with respect to the other
* graphics -- also if we are using font.pointSize.
*
* For these cases we calculate a fontRatio in ApplicationInfo that takes
* dpi information into account, as proposed on
- * http://doc.qt.io/qt-5/scalability.html#calculating-scaling-ratio
+ * https://doc.qt.io/qt-5/scalability.html#calculating-scaling-ratio
*
* GCText applies this factor automatically on its new fontSize property.
*/
Q_PROPERTY(qreal fontRatio READ fontRatio NOTIFY fontRatioChanged)
/**
* Short (2-letter) locale string of the currently active language.
*/
Q_PROPERTY(QString localeShort READ localeShort CONSTANT)
/**
* GCompris version string (compile time).
*/
Q_PROPERTY(QString GCVersion READ GCVersion CONSTANT)
/**
* GCompris version code (compile time).
*/
Q_PROPERTY(int GCVersionCode READ GCVersionCode CONSTANT)
/**
* Qt version string (runtime).
*/
Q_PROPERTY(QString QTVersion READ QTVersion CONSTANT)
/**
* Audio codec used for voices resources.
*
* This is determined at compile time (ogg for free platforms, aac on
* MacOSX and IOS).
*/
Q_PROPERTY(QString CompressedAudio READ CompressedAudio CONSTANT)
/**
* Download allowed
*
* This is determined at compile time. If set to NO GCompris will
* never download anything.
*/
Q_PROPERTY(bool isDownloadAllowed READ isDownloadAllowed CONSTANT)
/**
* Whether the application is currently using OpenGL or not.
*
* Use to deactivate some effects if OpenGL not used.
*/
Q_PROPERTY(bool useOpenGL READ useOpenGL WRITE setUseOpenGL NOTIFY useOpenGLChanged)
/**
* Whether Box2D is installed or not.
*
* Use to disable activities that use Box2D when it's not installed.
*/
Q_PROPERTY(bool isBox2DInstalled READ isBox2DInstalled NOTIFY isBox2DInstalledChanged)
public:
/**
* Known host platforms.
*/
enum Platform {
Linux, /**< Linux (except Android) */
Windows, /**< Windows */
MacOSX, /**< MacOSX */
Android, /**< Android */
Ios, /**< IOS (not supported) */
Blackberry, /**< Blackberry (not supported) */
SailfishOS /**< SailfishOS */
};
Q_ENUM(Platform)
/**
* Returns an absolute and platform independent path to the passed @p file
*
* @param file A relative filename.
* @returns Absolute path to the file.
*/
static QString getFilePath(const QString &file);
/**
* Returns the short locale name for the passed @p locale.
*
* Handles also 'system' (GC_DEFAULT_LOCALE) correctly which resolves to
* QLocale::system().name().
*
* @param locale A locale string of the form \<language\>_\<country\>
* @returns A short locale string of the form \<language\>
*/
static QString localeShort(const QString &locale) {
QString _locale = locale;
if(_locale == GC_DEFAULT_LOCALE) {
_locale = QLocale::system().name();
}
// Can't use left(2) because of Asturian where there are 3 chars
return _locale.left(_locale.indexOf('_'));
}
/**
* Returns a locale string that can be used in voices filenames.
*
* @param locale A locale string of the form \<language\>_\<country\>
* @returns A locale string as used in voices filenames.
*/
Q_INVOKABLE QString getVoicesLocale(const QString &locale);
/**
* Request GCompris to take the Audio Focus at the system level.
*
* On systems that support it, it will mute a running audio player.
*/
Q_INVOKABLE bool requestAudioFocus() const;
/**
* Abandon the Audio Focus.
*
* On systems that support it, it will let an audio player start again.
*/
Q_INVOKABLE void abandonAudioFocus() const;
/**
* Compare two strings respecting locale specific sort order.
*
* @param a First string to compare
* @param b Second string to compare
* @param locale Locale to respect for comparison in any of the forms
* used in GCompris xx[_XX][.codeset]. Defaults to currently
* set language from global configuration.
* @returns -1, 0 or 1 if a is less than, equal to or greater than b
*/
Q_INVOKABLE int localeCompare(const QString& a, const QString& b, const QString& locale = "") const;
/**
* Sort a list of strings respecting locale specific sort order.
*
* This function is supposed to be called from QML/JS. As there are still
* problems marshalling QStringList from C++ to QML/JS we use QVariantList
* both for argument and return value.
*
* @param list List of strings to be sorted.
* @param locale Locale to respect for sorting in any of the forms
* used in GCompris xx[_XX][.codeset].
* @returns List sorted by the sort order of the passed locale.
*/
Q_INVOKABLE QVariantList localeSort(QVariantList list, const QString& locale = "") const;
/// @cond INTERNAL_DOCS
static ApplicationInfo *getInstance() {
if(!m_instance) {
m_instance = new ApplicationInfo();
}
return m_instance;
}
static QObject *applicationInfoProvider(QQmlEngine *engine,
QJSEngine *scriptEngine);
static void setWindow(QQuickWindow *window);
explicit ApplicationInfo(QObject *parent = 0);
~ApplicationInfo();
int applicationWidth() const { return m_applicationWidth; }
void setApplicationWidth(const int newWidth);
Platform platform() const { return m_platform; }
bool isPortraitMode() const { return m_isPortraitMode; }
void setIsPortraitMode(const bool newMode);
bool isMobile() const { return m_isMobile; }
bool hasShader() const {
#if defined(Q_OS_ANDROID)
return false;
#else
return true;
#endif
}
qreal ratio() const { return m_ratio; }
qreal fontRatio() const { return m_fontRatio; }
QString localeShort() const {
return localeShort( ApplicationSettings::getInstance()->locale() );
}
static QString GCVersion() { return VERSION; }
static int GCVersionCode() { return VERSION_CODE; }
static QString QTVersion() { return qVersion(); }
static QString CompressedAudio() { return COMPRESSED_AUDIO; }
static bool isDownloadAllowed() { return QString(DOWNLOAD_ALLOWED) == "ON"; }
bool useOpenGL() const { return m_useOpenGL; }
void setUseOpenGL(bool useOpenGL) { m_useOpenGL = useOpenGL; }
bool isBox2DInstalled() const { return m_isBox2DInstalled; }
void setBox2DInstalled(const QQmlEngine &engine);
/**
* Returns the native screen orientation.
*
* Wraps QScreen::nativeOrientation: The native orientation of the screen
* is the orientation where the logo sticker of the device appears the
* right way up, or Qt::PrimaryOrientation if the platform does not support
* this functionality.
*
* The native orientation is a property of the hardware, and does not change
*/
Q_INVOKABLE Qt::ScreenOrientation getNativeOrientation();
/**
* Change the desired orientation of the application.
*
- * Android specific function, cf. http://developer.android.com/reference/android/app/Activity.html#setRequestedOrientation(int)
+ * Android specific function, cf. https://developer.android.com/reference/android/app/Activity.html#setRequestedOrientation(int)
*
* @param orientation Desired orientation of the application. For possible
- * values cf. http://developer.android.com/reference/android/content/pm/ActivityInfo.html#screenOrientation .
+ * values cf. https://developer.android.com/reference/android/content/pm/ActivityInfo.html#screenOrientation .
* Some useful values:
* - -1: SCREEN_ORIENTATION_UNSPECIFIED
* - 0: SCREEN_ORIENTATION_LANDSCAPE: forces landscape
* - 1: SCREEN_ORIENTATION_PORTRAIT: forces portrait
* - 5: SCREEN_ORIENTATION_NOSENSOR: forces native
* orientation mode on each device (portrait on
* smartphones, landscape on tablet)
* - 14: SCREEN_ORIENTATION_LOCKED: lock current orientation
*/
Q_INVOKABLE void setRequestedOrientation(int orientation);
/**
* Query the desired orientation of the application.
*
* @sa setRequestedOrientation
*/
Q_INVOKABLE int getRequestedOrientation();
/**
* Checks whether a sensor type from the QtSensor module is supported on
* the current platform.
*
* @param sensorType Classname of a sensor from the QtSensor module
* to be checked (e.g. "QTiltSensor").
*/
Q_INVOKABLE bool sensorIsSupported(const QString& sensorType);
/**
* Toggles activation of screensaver on android
*
* @param value Whether screensaver should be disabled (true) or
* enabled (false).
*/
Q_INVOKABLE void setKeepScreenOn(bool value);
/// @endcond
public slots:
/**
* Returns the resource root-path used for GCompris resources.
*/
QString getResourceDataPath();
/**
* Returns an absolute path to a language specific sound/voices file. If
* the file is already absolute only the token replacement is applied.
*
* @param file A templated relative path to a language specific file. Any
* occurrence of the '$LOCALE' placeholder will be replaced by
* the currently active locale string.
* Any occurrence of '$CA' placeholder will be replaced by
* the current compressed audio format ('ogg' or 'aac).
* Example: 'voices-$CA/$LOCALE/misc/click_on_letter.$CA'
* @returns An absolute path to the corresponding resource file.
*/
Q_INVOKABLE QString getAudioFilePath(const QString &file);
/**
* Returns an absolute path to a language specific sound/voices file. If
* the file is already absolute only the token replacement is applied.
*
* @param file A templated relative path to a language specific file. Any
* occurrence of the '$LOCALE' placeholder will be replaced by
* the currently active locale string.
* Any occurrence of '$CA' placeholder will be replaced by
* the current compressed audio format ('ogg' or 'aac).
* Example: 'voices-$CA/$LOCALE/misc/click_on_letter.$CA'
* @param localeName the locale for which to get this audio file
* @returns An absolute path to the corresponding resource file.
*/
Q_INVOKABLE QString getAudioFilePathForLocale(const QString &file,
const QString &localeName);
/**
* Returns an absolute path to a language specific resource file.
*
* Generalization of getAudioFilePath().
* @sa getAudioFilePath
*/
Q_INVOKABLE QString getLocaleFilePath(const QString &file);
/**
* @returns A list of systems-fonts that should be excluded from font
* selection.
*/
Q_INVOKABLE QStringList getSystemExcludedFonts();
/**
* @returns A list of fonts contained in the fonts resources.
*/
Q_INVOKABLE QStringList getFontsFromRcc();
-
+ /**
+ * @returns A list of background music contained in the background music resources.
+ */
+ Q_INVOKABLE QStringList getBackgroundMusicFromRcc();
/**
* Stores a screenshot in the passed @p file.
*
* @param file Absolute destination filename.
*/
Q_INVOKABLE void screenshot(const QString &file);
void notifyPortraitMode();
Q_INVOKABLE void notifyFullscreenChanged();
protected:
qreal getSizeWithRatio(const qreal height) { return ratio() * height; }
signals:
void applicationWidthChanged();
void portraitModeChanged();
void ratioChanged();
void fontRatioChanged();
void applicationSettingsChanged();
void fullscreenChanged();
void useOpenGLChanged();
void isBox2DInstalledChanged();
private:
static ApplicationInfo *m_instance;
int m_applicationWidth;
Platform m_platform;
bool m_isPortraitMode;
bool m_isMobile;
bool m_useOpenGL;
bool m_isBox2DInstalled;
qreal m_ratio;
qreal m_fontRatio;
// Symbols fonts that user can't see
QStringList m_excludedFonts;
QStringList m_fontsFromRcc;
+ QStringList m_backgroundMusicFromRcc;
static QQuickWindow *m_window;
};
#endif // APPLICATIONINFO_H
diff --git a/src/core/ApplicationSettings.cpp b/src/core/ApplicationSettings.cpp
index a665d8642..45013b37d 100644
--- a/src/core/ApplicationSettings.cpp
+++ b/src/core/ApplicationSettings.cpp
@@ -1,522 +1,558 @@
/* GCompris - ApplicationSettings.cpp
*
* Copyright (C) 2014-2016 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include "ApplicationSettings.h"
#include "ApplicationInfo.h"
#include "DownloadManager.h"
#include <qmath.h>
#include <QUrl>
#include <QUrlQuery>
#include <QGuiApplication>
#include <QScreen>
#include <QLocale>
-#include <QApplication>
#include <QRect>
-#include <QDesktopWidget>
#include <QtQml>
#define GC_DEFAULT_FONT QLatin1String("Andika-R.otf")
#define GC_DEFAULT_FONT_CAPITALIZATION 0 // Font.MixedCase
#define GC_DEFAULT_FONT_LETTER_SPACING 0
static const char *GENERAL_GROUP_KEY = "General";
static const char *ADMIN_GROUP_KEY = "Admin";
static const char *INTERNAL_GROUP_KEY = "Internal";
static const char *FAVORITE_GROUP_KEY = "Favorite";
static const char *LEVELS_GROUP_KEY = "Levels";
static const char *FULLSCREEN_KEY = "fullscreen";
static const char *PREVIOUS_HEIGHT_KEY = "previousHeight";
static const char *PREVIOUS_WIDTH_KEY = "previousWidth";
static const char *SHOW_LOCKED_ACTIVITIES_KEY = "showLockedActivities";
static const char *ENABLE_AUDIO_VOICES_KEY = "enableAudioVoices";
static const char *ENABLE_AUDIO_EFFECTS_KEY = "enableAudioEffects";
+static const char *ENABLE_BACKGROUND_MUSIC_KEY = "enableBackgroundMusic";
static const char *VIRTUALKEYBOARD_KEY = "virtualKeyboard";
static const char *LOCALE_KEY = "locale";
static const char *FONT_KEY = "font";
static const char *IS_CURRENT_FONT_EMBEDDED = "isCurrentFontEmbedded";
static const char *ENABLE_AUTOMATIC_DOWNLOADS = "enableAutomaticDownloads";
+static const char *FILTERED_BACKGROUND_MUSIC_KEY = "filteredBackgroundMusic";
+static const char *BACKGROUND_MUSIC_VOLUME_KEY = "backgroundMusicVolume";
+static const char *AUDIO_EFFECTS_VOLUME_KEY = "audioEffectsVolume";
static const char *DOWNLOAD_SERVER_URL_KEY = "downloadServerUrl";
static const char *CACHE_PATH_KEY = "cachePath";
static const char *USERDATA_PATH_KEY = "userDataPath";
static const char *RENDERER_KEY = "renderer";
static const char *EXE_COUNT_KEY = "exeCount";
static const char *LAST_GC_VERSION_RAN = "lastGCVersionRan";
static const char *FILTER_LEVEL_MIN = "filterLevelMin";
static const char *FILTER_LEVEL_MAX = "filterLevelMax";
static const char *BASE_FONT_SIZE_KEY = "baseFontSize";
static const char *FONT_CAPITALIZATION = "fontCapitalization";
static const char *FONT_LETTER_SPACING = "fontLetterSpacing";
static const char *DEFAULT_CURSOR = "defaultCursor";
static const char *NO_CURSOR = "noCursor";
static const char *DEMO_KEY = "demo";
static const char *CODE_KEY = "key";
static const char *KIOSK_KEY = "kiosk";
static const char *SECTION_VISIBLE = "sectionVisible";
static const char *WORDSET = "wordset";
static const char *PROGRESS_KEY = "progress";
static const char *DEFAULT_DOWNLOAD_SERVER = "https://cdn.kde.org/gcompris";
ApplicationSettings *ApplicationSettings::m_instance = nullptr;
ApplicationSettings::ApplicationSettings(const QString &configPath, QObject *parent): QObject(parent),
m_baseFontSizeMin(-7), m_baseFontSizeMax(7),
m_fontLetterSpacingMin(0.0), m_fontLetterSpacingMax(8.0),
m_config(configPath, QSettings::IniFormat)
{
- const QRect &screenSize = QApplication::desktop()->screenGeometry();
-
+ const QRect &screenSize = QGuiApplication::screens().at(0)->availableGeometry();
// initialize from settings file or default
// general group
m_config.beginGroup(GENERAL_GROUP_KEY);
m_isAudioEffectsEnabled = m_config.value(ENABLE_AUDIO_EFFECTS_KEY, true).toBool();
+ m_isBackgroundMusicEnabled = m_config.value(ENABLE_BACKGROUND_MUSIC_KEY, true).toBool();
m_isFullscreen = m_config.value(FULLSCREEN_KEY, true).toBool();
m_previousHeight = m_config.value(PREVIOUS_HEIGHT_KEY, screenSize.height()).toUInt();
m_previousWidth = m_config.value(PREVIOUS_WIDTH_KEY, screenSize.width()).toUInt();
m_isAudioVoicesEnabled = m_config.value(ENABLE_AUDIO_VOICES_KEY, true).toBool();
m_isVirtualKeyboard = m_config.value(VIRTUALKEYBOARD_KEY,
ApplicationInfo::getInstance()->isMobile()).toBool();
m_locale = m_config.value(LOCALE_KEY, GC_DEFAULT_LOCALE).toString();
m_font = m_config.value(FONT_KEY, GC_DEFAULT_FONT).toString();
if(m_font == QLatin1String("Andika-R.ttf"))
m_font = "Andika-R.otf";
m_fontCapitalization = m_config.value(FONT_CAPITALIZATION, GC_DEFAULT_FONT_CAPITALIZATION).toUInt();
m_fontLetterSpacing = m_config.value(FONT_LETTER_SPACING, GC_DEFAULT_FONT_LETTER_SPACING).toReal();
m_isEmbeddedFont = m_config.value(IS_CURRENT_FONT_EMBEDDED, true).toBool();
+ m_filteredBackgroundMusic = m_config.value(FILTERED_BACKGROUND_MUSIC_KEY, ApplicationInfo::getInstance()->getBackgroundMusicFromRcc()).toStringList();
+ m_backgroundMusicVolume = m_config.value(BACKGROUND_MUSIC_VOLUME_KEY, 0.2).toReal();
+ m_audioEffectsVolume = m_config.value(AUDIO_EFFECTS_VOLUME_KEY, 0.7).toReal();
// Init the activation mode
if(QLatin1String(ACTIVATION_MODE) == "no")
m_activationMode = 0;
else if(QLatin1String(ACTIVATION_MODE) == "inapp")
m_activationMode = 1;
else if(QLatin1String(ACTIVATION_MODE) == "internal")
m_activationMode = 2;
else
qFatal("Unknown activation mode");
// Set the demo mode
if(QLatin1String(ACTIVATION_MODE) != "no")
m_isDemoMode = m_config.value(DEMO_KEY, true).toBool();
else
m_isDemoMode = false;
m_codeKey = m_config.value(CODE_KEY, "").toString();
#if defined(WITH_KIOSK_MODE)
m_isKioskMode = m_config.value(KIOSK_KEY, true).toBool();
#else
m_isKioskMode = m_config.value(KIOSK_KEY, false).toBool();
#endif
// Option only useful if we are in demo mode (else all the activities are available and unlocked)
// By default, all the activities are displayed (even locked ones)
m_showLockedActivities = m_config.value(SHOW_LOCKED_ACTIVITIES_KEY, m_isDemoMode).toBool();
m_sectionVisible = m_config.value(SECTION_VISIBLE, true).toBool();
m_wordset = m_config.value(WORDSET, "").toString();
m_isAutomaticDownloadsEnabled = m_config.value(ENABLE_AUTOMATIC_DOWNLOADS,
!ApplicationInfo::getInstance()->isMobile() && ApplicationInfo::isDownloadAllowed()).toBool();
m_filterLevelMin = m_config.value(FILTER_LEVEL_MIN, 1).toUInt();
m_filterLevelMax = m_config.value(FILTER_LEVEL_MAX, 6).toUInt();
m_defaultCursor = m_config.value(DEFAULT_CURSOR, false).toBool();
m_noCursor = m_config.value(NO_CURSOR, false).toBool();
m_baseFontSize = m_config.value(BASE_FONT_SIZE_KEY, 0).toInt();
m_config.sync(); // make sure all defaults are written back
m_config.endGroup();
// admin group
m_config.beginGroup(ADMIN_GROUP_KEY);
m_downloadServerUrl = m_config.value(DOWNLOAD_SERVER_URL_KEY, QLatin1String(DEFAULT_DOWNLOAD_SERVER)).toString();
if(m_downloadServerUrl == "http://gcompris.net") {
setDownloadServerUrl(DEFAULT_DOWNLOAD_SERVER);
}
m_cachePath = m_config.value(CACHE_PATH_KEY, QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).toString();
m_userDataPath = m_config.value(USERDATA_PATH_KEY, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/GCompris")).toString();
m_renderer = m_config.value(RENDERER_KEY, GRAPHICAL_RENDERER).toString();
m_config.endGroup();
// internal group
m_config.beginGroup(INTERNAL_GROUP_KEY);
m_exeCount = m_config.value(EXE_COUNT_KEY, 0).toUInt();
m_lastGCVersionRan = m_config.value(LAST_GC_VERSION_RAN, 0).toUInt();
m_config.endGroup();
// no group
m_isBarHidden = false;
connect(this, &ApplicationSettings::showLockedActivitiesChanged, this, &ApplicationSettings::notifyShowLockedActivitiesChanged);
connect(this, &ApplicationSettings::audioVoicesEnabledChanged, this, &ApplicationSettings::notifyAudioVoicesEnabledChanged);
connect(this, &ApplicationSettings::audioEffectsEnabledChanged, this, &ApplicationSettings::notifyAudioEffectsEnabledChanged);
+ connect(this, &ApplicationSettings::backgroundMusicEnabledChanged, this, &ApplicationSettings::notifyBackgroundMusicEnabledChanged);
+ connect(this, &ApplicationSettings::filteredBackgroundMusicChanged, this, &ApplicationSettings::notifyFilteredBackgroundMusicChanged);
connect(this, &ApplicationSettings::fullscreenChanged, this, &ApplicationSettings::notifyFullscreenChanged);
connect(this, &ApplicationSettings::previousHeightChanged, this, &ApplicationSettings::notifyPreviousHeightChanged);
connect(this, &ApplicationSettings::previousWidthChanged, this, &ApplicationSettings::notifyPreviousWidthChanged);
connect(this, &ApplicationSettings::localeChanged, this, &ApplicationSettings::notifyLocaleChanged);
connect(this, &ApplicationSettings::fontChanged, this, &ApplicationSettings::notifyFontChanged);
connect(this, &ApplicationSettings::virtualKeyboardChanged, this, &ApplicationSettings::notifyVirtualKeyboardChanged);
connect(this, &ApplicationSettings::automaticDownloadsEnabledChanged, this, &ApplicationSettings::notifyAutomaticDownloadsEnabledChanged);
connect(this, &ApplicationSettings::filterLevelMinChanged, this, &ApplicationSettings::notifyFilterLevelMinChanged);
connect(this, &ApplicationSettings::filterLevelMaxChanged, this, &ApplicationSettings::notifyFilterLevelMaxChanged);
connect(this, &ApplicationSettings::sectionVisibleChanged, this, &ApplicationSettings::notifySectionVisibleChanged);
connect(this, &ApplicationSettings::wordsetChanged, this, &ApplicationSettings::notifyWordsetChanged);
connect(this, &ApplicationSettings::demoModeChanged, this, &ApplicationSettings::notifyDemoModeChanged);
connect(this, &ApplicationSettings::codeKeyChanged, this, &ApplicationSettings::notifyCodeKeyChanged);
connect(this, &ApplicationSettings::kioskModeChanged, this, &ApplicationSettings::notifyKioskModeChanged);
connect(this, &ApplicationSettings::downloadServerUrlChanged, this, &ApplicationSettings::notifyDownloadServerUrlChanged);
connect(this, &ApplicationSettings::cachePathChanged, this, &ApplicationSettings::notifyCachePathChanged);
connect(this, &ApplicationSettings::userDataPathChanged, this, &ApplicationSettings::notifyUserDataPathChanged);
connect(this, &ApplicationSettings::rendererChanged, this, &ApplicationSettings::notifyRendererChanged);
connect(this, &ApplicationSettings::exeCountChanged, this, &ApplicationSettings::notifyExeCountChanged);
connect(this, &ApplicationSettings::barHiddenChanged, this, &ApplicationSettings::notifyBarHiddenChanged);
connect(this, &ApplicationSettings::lastGCVersionRanChanged, this, &ApplicationSettings::notifyLastGCVersionRanChanged);
+ connect(this, &ApplicationSettings::backgroundMusicVolumeChanged, this, &ApplicationSettings::notifyBackgroundMusicVolumeChanged);
+ connect(this, &ApplicationSettings::audioEffectsVolumeChanged, this, &ApplicationSettings::notifyAudioEffectsVolumeChanged);
}
ApplicationSettings::~ApplicationSettings()
{
// make sure settings file is up2date:
// general group
m_config.beginGroup(GENERAL_GROUP_KEY);
m_config.setValue(SHOW_LOCKED_ACTIVITIES_KEY, m_showLockedActivities);
m_config.setValue(ENABLE_AUDIO_VOICES_KEY, m_isAudioVoicesEnabled);
+ m_config.setValue(ENABLE_BACKGROUND_MUSIC_KEY, m_isBackgroundMusicEnabled);
+ m_config.setValue(FILTERED_BACKGROUND_MUSIC_KEY, m_filteredBackgroundMusic);
+ m_config.setValue(BACKGROUND_MUSIC_VOLUME_KEY, m_backgroundMusicVolume);
+ m_config.setValue(AUDIO_EFFECTS_VOLUME_KEY, m_audioEffectsVolume);
m_config.setValue(LOCALE_KEY, m_locale);
m_config.setValue(FONT_KEY, m_font);
m_config.setValue(IS_CURRENT_FONT_EMBEDDED, m_isEmbeddedFont);
m_config.setValue(FULLSCREEN_KEY, m_isFullscreen);
m_config.setValue(PREVIOUS_HEIGHT_KEY, m_previousHeight);
m_config.setValue(PREVIOUS_WIDTH_KEY, m_previousWidth);
m_config.setValue(VIRTUALKEYBOARD_KEY, m_isVirtualKeyboard);
m_config.setValue(ENABLE_AUTOMATIC_DOWNLOADS, m_isAutomaticDownloadsEnabled);
m_config.setValue(FILTER_LEVEL_MIN, m_filterLevelMin);
m_config.setValue(FILTER_LEVEL_MAX, m_filterLevelMax);
m_config.setValue(DEMO_KEY, m_isDemoMode);
m_config.setValue(CODE_KEY, m_codeKey);
m_config.setValue(KIOSK_KEY, m_isKioskMode);
m_config.setValue(SECTION_VISIBLE, m_sectionVisible);
m_config.setValue(WORDSET, m_wordset);
m_config.setValue(DEFAULT_CURSOR, m_defaultCursor);
m_config.setValue(NO_CURSOR, m_noCursor);
m_config.setValue(BASE_FONT_SIZE_KEY, m_baseFontSize);
m_config.setValue(FONT_CAPITALIZATION, m_fontCapitalization);
m_config.setValue(FONT_LETTER_SPACING, m_fontLetterSpacing);
m_config.endGroup();
// admin group
m_config.beginGroup(ADMIN_GROUP_KEY);
m_config.setValue(DOWNLOAD_SERVER_URL_KEY, m_downloadServerUrl);
m_config.setValue(CACHE_PATH_KEY, m_cachePath);
m_config.setValue(USERDATA_PATH_KEY, m_userDataPath);
m_config.setValue(RENDERER_KEY, m_renderer);
m_config.endGroup();
// internal group
m_config.beginGroup(INTERNAL_GROUP_KEY);
m_config.setValue(EXE_COUNT_KEY, m_exeCount);
m_config.setValue(LAST_GC_VERSION_RAN, m_lastGCVersionRan);
m_config.endGroup();
m_config.sync();
m_instance = nullptr;
}
void ApplicationSettings::notifyShowLockedActivitiesChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, SHOW_LOCKED_ACTIVITIES_KEY, m_showLockedActivities);
qDebug() << "notifyShowLockedActivitiesChanged: " << m_showLockedActivities;
}
void ApplicationSettings::notifyAudioVoicesEnabledChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, ENABLE_AUDIO_VOICES_KEY, m_isAudioVoicesEnabled);
qDebug() << "notifyAudioVoices: " << m_isAudioVoicesEnabled;
}
void ApplicationSettings::notifyAudioEffectsEnabledChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, ENABLE_AUDIO_EFFECTS_KEY, m_isAudioEffectsEnabled);
qDebug() << "notifyAudioEffects: " << m_isAudioEffectsEnabled;
}
+void ApplicationSettings::notifyBackgroundMusicEnabledChanged()
+{
+ updateValueInConfig(GENERAL_GROUP_KEY, ENABLE_BACKGROUND_MUSIC_KEY, m_isBackgroundMusicEnabled);
+ qDebug() << "notifyBackgroundMusic: " << m_isBackgroundMusicEnabled;
+}
+
+void ApplicationSettings::notifyFilteredBackgroundMusicChanged()
+{
+ updateValueInConfig(GENERAL_GROUP_KEY, FILTERED_BACKGROUND_MUSIC_KEY, m_filteredBackgroundMusic);
+ qDebug()<<"filteredBackgroundMusic: " << m_filteredBackgroundMusic;
+}
+
+void ApplicationSettings::notifyBackgroundMusicVolumeChanged()
+{
+ updateValueInConfig(GENERAL_GROUP_KEY, BACKGROUND_MUSIC_VOLUME_KEY, m_backgroundMusicVolume);
+ qDebug()<<"backgroundMusicVolume: " << m_backgroundMusicVolume;
+}
+
+void ApplicationSettings::notifyAudioEffectsVolumeChanged()
+{
+ updateValueInConfig(GENERAL_GROUP_KEY, AUDIO_EFFECTS_VOLUME_KEY, m_audioEffectsVolume);
+ qDebug()<<"audioEffectsVolume: " << m_audioEffectsVolume;
+}
+
void ApplicationSettings::notifyLocaleChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, LOCALE_KEY, m_locale);
qDebug() << "new locale: " << m_locale;
}
void ApplicationSettings::notifyFontChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, FONT_KEY, m_font);
qDebug() << "new font: " << m_font;
}
void ApplicationSettings::notifyEmbeddedFontChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, IS_CURRENT_FONT_EMBEDDED, m_isEmbeddedFont);
qDebug() << "new font is embedded: " << m_isEmbeddedFont;
}
void ApplicationSettings::notifyFontCapitalizationChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, FONT_CAPITALIZATION, m_fontCapitalization);
qDebug() << "new fontCapitalization: " << m_fontCapitalization;
}
void ApplicationSettings::notifyFontLetterSpacingChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, FONT_LETTER_SPACING, m_fontLetterSpacing);
qDebug() << "new fontLetterSpacing: " << m_fontLetterSpacing;
}
void ApplicationSettings::notifyFullscreenChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, FULLSCREEN_KEY, m_isFullscreen);
qDebug() << "fullscreen set to: " << m_isFullscreen;
}
void ApplicationSettings::notifyPreviousHeightChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, PREVIOUS_HEIGHT_KEY, m_previousHeight);
qDebug() << "previous height set to: " << m_previousHeight;
}
void ApplicationSettings::notifyPreviousWidthChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, PREVIOUS_WIDTH_KEY, m_previousWidth);
qDebug() << "previous width set to: " << m_previousWidth;
}
void ApplicationSettings::notifyVirtualKeyboardChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, VIRTUALKEYBOARD_KEY, m_isVirtualKeyboard);
qDebug() << "virtualkeyboard set to: " << m_isVirtualKeyboard;
}
bool ApplicationSettings::isAutomaticDownloadsEnabled() const {
return m_isAutomaticDownloadsEnabled && ApplicationInfo::isDownloadAllowed();
}
void ApplicationSettings::setIsAutomaticDownloadsEnabled(const bool newIsAutomaticDownloadsEnabled) {
if(ApplicationInfo::isDownloadAllowed()) {
m_isAutomaticDownloadsEnabled = newIsAutomaticDownloadsEnabled;
emit automaticDownloadsEnabledChanged();
}
}
-
void ApplicationSettings::notifyAutomaticDownloadsEnabledChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, ENABLE_AUTOMATIC_DOWNLOADS, m_isAutomaticDownloadsEnabled);
qDebug() << "enableAutomaticDownloads set to: " << m_isAutomaticDownloadsEnabled;
}
void ApplicationSettings::notifyFilterLevelMinChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, FILTER_LEVEL_MIN, m_filterLevelMin);
qDebug() << "filterLevelMin set to: " << m_filterLevelMin;
}
void ApplicationSettings::notifyFilterLevelMaxChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, FILTER_LEVEL_MAX, m_filterLevelMax);
qDebug() << "filterLevelMax set to: " << m_filterLevelMax;
}
void ApplicationSettings::notifyDemoModeChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, DEMO_KEY, m_isDemoMode);
qDebug() << "notifyDemoMode: " << m_isDemoMode;
}
void ApplicationSettings::notifyCodeKeyChanged()
{
checkPayment();
if(!m_isDemoMode)
updateValueInConfig(GENERAL_GROUP_KEY, CODE_KEY, m_codeKey);
qDebug() << "notifyCodeKey: " << m_codeKey;
}
void ApplicationSettings::notifyKioskModeChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, KIOSK_KEY, m_isKioskMode);
qDebug() << "notifyKioskMode: " << m_isKioskMode;
}
void ApplicationSettings::notifySectionVisibleChanged()
{
updateValueInConfig(GENERAL_GROUP_KEY, SECTION_VISIBLE, m_sectionVisible);
qDebug() << "notifySectionVisible: " << m_sectionVisible;
}
void ApplicationSettings::notifyWordsetChanged()
{
if(!m_wordset.isEmpty() &&
DownloadManager::getInstance()->haveLocalResource(m_wordset) &&
!DownloadManager::getInstance()->isDataRegistered("words")) {
// words.rcc is there -> register old file first
// then try to update in the background
DownloadManager::getInstance()->updateResource(m_wordset);
}
updateValueInConfig(GENERAL_GROUP_KEY, WORDSET, m_wordset);
qDebug() << "notifyWordset: " << m_wordset;
}
void ApplicationSettings::notifyDownloadServerUrlChanged()
{
updateValueInConfig(ADMIN_GROUP_KEY, DOWNLOAD_SERVER_URL_KEY, m_downloadServerUrl);
qDebug() << "downloadServerUrl set to: " << m_downloadServerUrl;
}
void ApplicationSettings::notifyCachePathChanged()
{
updateValueInConfig(ADMIN_GROUP_KEY, CACHE_PATH_KEY, m_cachePath);
qDebug() << "cachePath set to: " << m_cachePath;
}
void ApplicationSettings::notifyUserDataPathChanged()
{
updateValueInConfig(ADMIN_GROUP_KEY, USERDATA_PATH_KEY, m_userDataPath);
qDebug() << "userDataPath set to: " << m_userDataPath;
}
void ApplicationSettings::notifyRendererChanged()
{
updateValueInConfig(ADMIN_GROUP_KEY, RENDERER_KEY, m_renderer);
qDebug() << "renderer set to: " << m_renderer;
}
void ApplicationSettings::notifyExeCountChanged()
{
updateValueInConfig(INTERNAL_GROUP_KEY, EXE_COUNT_KEY, m_exeCount);
qDebug() << "exeCount set to: " << m_exeCount;
}
void ApplicationSettings::notifyLastGCVersionRanChanged()
{
updateValueInConfig(INTERNAL_GROUP_KEY, LAST_GC_VERSION_RAN, m_lastGCVersionRan);
qDebug() << "lastVersionRan set to: " << m_lastGCVersionRan;
}
void ApplicationSettings::notifyBarHiddenChanged()
{
qDebug() << "is bar hidden: " << m_isBarHidden;
}
void ApplicationSettings::saveBaseFontSize()
{
updateValueInConfig(GENERAL_GROUP_KEY, BASE_FONT_SIZE_KEY, m_baseFontSize);
}
void ApplicationSettings::saveActivityConfiguration(const QString &activity, const QVariantMap &data)
{
qDebug() << "save configuration for:" << activity;
QMapIterator<QString, QVariant> i(data);
while (i.hasNext()) {
i.next();
updateValueInConfig(activity, i.key(), i.value());
}
}
QVariantMap ApplicationSettings::loadActivityConfiguration(const QString &activity)
{
qDebug() << "load configuration for:" << activity;
m_config.beginGroup(activity);
QStringList keys = m_config.childKeys();
QVariantMap data;
for(const QString &key : keys) {
data[key] = m_config.value(key);
}
m_config.endGroup();
return data;
}
void ApplicationSettings::setFavorite(const QString &activity, bool favorite)
{
updateValueInConfig(FAVORITE_GROUP_KEY, activity, favorite);
}
bool ApplicationSettings::isFavorite(const QString &activity)
{
m_config.beginGroup(FAVORITE_GROUP_KEY);
bool favorite = m_config.value(activity, false).toBool();
m_config.endGroup();
return favorite;
}
void ApplicationSettings::setCurrentLevels(const QString &activity, const QStringList &level)
{
updateValueInConfig(LEVELS_GROUP_KEY, activity, level);
}
QStringList ApplicationSettings::currentLevels(const QString &activity)
{
m_config.beginGroup(LEVELS_GROUP_KEY);
QStringList level = m_config.value(activity, QStringList()).toStringList();
m_config.endGroup();
return level;
}
template<class T> void ApplicationSettings::updateValueInConfig(const QString& group,
const QString& key, const T& value)
{
m_config.beginGroup(group);
m_config.setValue(key, value);
m_config.endGroup();
m_config.sync();
}
int ApplicationSettings::loadActivityProgress(const QString &activity)
{
int progress = 0;
m_config.beginGroup(activity);
progress = m_config.value(PROGRESS_KEY, 0).toInt();
m_config.endGroup();
qDebug() << "loaded progress for activity" << activity << ":" << progress;
return progress;
}
void ApplicationSettings::saveActivityProgress(const QString &activity, int progress)
{
updateValueInConfig(activity, PROGRESS_KEY, progress);
}
bool ApplicationSettings::useExternalWordset()
{
return !m_wordset.isEmpty() && DownloadManager::getInstance()->isDataRegistered("words");
}
QObject *ApplicationSettings::applicationSettingsProvider(QQmlEngine *engine,
QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
ApplicationSettings* appSettings = getInstance();
return appSettings;
}
diff --git a/src/core/ApplicationSettings.h b/src/core/ApplicationSettings.h
index 122f5a37b..cebb66329 100644
--- a/src/core/ApplicationSettings.h
+++ b/src/core/ApplicationSettings.h
@@ -1,659 +1,714 @@
/* GCompris - ApplicationSettings.h
*
* Copyright (C) 2014 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#ifndef APPLICATIONSETTINGS_H
#define APPLICATIONSETTINGS_H
#include <QObject>
#include <QQmlEngine>
#include <QtGlobal>
#include <QDebug>
#include <QSettings>
#include <QStandardPaths>
#include <config.h>
#define GC_DEFAULT_LOCALE "system"
/**
* @class ApplicationSettings
* @short Singleton that contains GCompris' persistent settings.
* @ingroup infrastructure
*
* Settings are persisted using QSettings, which stores them in platform
* specific locations.
*
* The settings are subdivided in different groups of settings.
*
* <em>[General]</em> settings are mostly changeable by users in the DialogConfig
* dialog.
*
* <em>[Admin]</em> and <em>[Internal]</em> settings are not changeable by the
* user and used for internal purposes. Should only be changed if you really know
* what you are doing.
*
* The <em>[Favorite]</em> group is auto-generated from the favorite activities
* selected by a user.
*
* The <em>[Levels]</em> group is auto-generated from the levels chosen by
* a user (if the activity provides multiple datasets).
*
* Besides these global settings there is one group for each activity that
* stores persistent settings.
*
* Settings defaults are defined in the source code.
*
* @sa DialogActivityConfig
*/
class ApplicationSettings : public QObject
{
Q_OBJECT
/* General group */
/**
* Whether to show locked activities.
* False if in Demo mode, true otherwise.
*/
Q_PROPERTY(bool showLockedActivities READ showLockedActivities WRITE setShowLockedActivities NOTIFY showLockedActivitiesChanged)
/**
* Whether audio voices/speech should be enabled.
*/
Q_PROPERTY(bool isAudioVoicesEnabled READ isAudioVoicesEnabled WRITE setIsAudioVoicesEnabled NOTIFY audioVoicesEnabledChanged)
/**
* Whether audio effects should be enabled.
*/
- Q_PROPERTY(bool isAudioEffectsEnabled READ isAudioEffectsEnabled WRITE setIsAudioEffectsEnabled NOTIFY audioEffectsEnabledChanged)
+ Q_PROPERTY(bool isAudioEffectsEnabled READ isAudioEffectsEnabled WRITE setIsAudioEffectsEnabled NOTIFY audioEffectsEnabledChanged)
+
+ /** Whether background music should be enabled.
+ */
+ Q_PROPERTY(bool isBackgroundMusicEnabled READ isBackgroundMusicEnabled WRITE setIsBackgroundMusicEnabled NOTIFY backgroundMusicEnabledChanged)
/**
* Whether GCompris should run in fullscreen mode.
*/
Q_PROPERTY(bool isFullscreen READ isFullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
/**
* Window Height on Application's Startup
*/
Q_PROPERTY(quint32 previousHeight READ previousHeight WRITE setPreviousHeight NOTIFY previousHeightChanged)
/**
* Window Width on Application's Startup
*/
Q_PROPERTY(quint32 previousWidth READ previousWidth WRITE setPreviousWidth NOTIFY previousWidthChanged)
/**
* Whether on-screen keyboard should be enabled per default in activities
* that use it.
*/
Q_PROPERTY(bool isVirtualKeyboard READ isVirtualKeyboard WRITE setVirtualKeyboard NOTIFY virtualKeyboardChanged)
/**
* Locale string for currently active language.
*/
Q_PROPERTY(QString locale READ locale WRITE setLocale NOTIFY localeChanged)
/**
* Currently selected font.
*/
Q_PROPERTY(QString font READ font WRITE setFont NOTIFY fontChanged)
/**
* Whether currently active font is a shipped font (or a system font).
*
* Updated automatically.
* @sa font
*/
Q_PROPERTY(bool isEmbeddedFont READ isEmbeddedFont WRITE setIsEmbeddedFont NOTIFY embeddedFontChanged)
/**
* Font Capitalization
*
* Force all texts to be rendered in UpperCase, LowerCase or MixedCase (default)
* @sa font
*/
Q_PROPERTY(quint32 fontCapitalization READ fontCapitalization WRITE setFontCapitalization NOTIFY fontCapitalizationChanged)
/**
* Font letter spacing
*
* Change the letter spacing of all the texts
* @sa font
*/
Q_PROPERTY(qreal fontLetterSpacing READ fontLetterSpacing WRITE setFontLetterSpacing NOTIFY fontLetterSpacingChanged)
/**
* Minimum allowed value for font spacing letter.
*
* Constant value: +0.0
*/
Q_PROPERTY(qreal fontLetterSpacingMin READ fontLetterSpacingMin CONSTANT)
/**
* Maximum allowed value for font spacing letter.
*
* Constant value: +8.0
*/
Q_PROPERTY(qreal fontLetterSpacingMax READ fontLetterSpacingMax CONSTANT)
/**
* Whether downloads/updates of resource files should be done automatically,
* without user-interaction.
*
* Note, that on Android GCompris currently can't distinguish Wifi
* from mobile data connections (cf. Qt ticket #30394).
*/
Q_PROPERTY(bool isAutomaticDownloadsEnabled READ isAutomaticDownloadsEnabled WRITE setIsAutomaticDownloadsEnabled NOTIFY automaticDownloadsEnabledChanged)
/**
* Minimum value for difficulty level filter.
*/
Q_PROPERTY(quint32 filterLevelMin READ filterLevelMin WRITE setFilterLevelMin NOTIFY filterLevelMinChanged)
/**
* Maximum value for difficulty level filter.
*/
Q_PROPERTY(quint32 filterLevelMax READ filterLevelMax WRITE setFilterLevelMax NOTIFY filterLevelMaxChanged)
/**
* Whether in demo mode.
*/
Q_PROPERTY(bool isDemoMode READ isDemoMode WRITE setDemoMode NOTIFY demoModeChanged)
/**
* Activation code key.
*/
Q_PROPERTY(QString codeKey READ codeKey WRITE setCodeKey NOTIFY codeKeyChanged)
/**
* Activation mode.
*/
Q_PROPERTY(quint32 activationMode READ activationMode CONSTANT)
/**
* Whether kiosk mode is currently active.
*/
Q_PROPERTY(bool isKioskMode READ isKioskMode WRITE setKioskMode NOTIFY kioskModeChanged)
/**
* Whether the section selection row is visible in the menu view.
*/
Q_PROPERTY(bool sectionVisible READ sectionVisible WRITE setSectionVisible NOTIFY sectionVisibleChanged)
/**
* The name of the default wordset to use. If empty then the internal sample wordset is used.
*/
Q_PROPERTY(QString wordset READ wordset WRITE setWordset NOTIFY wordsetChanged)
/**
* Current base font-size used for font scaling.
*
* This setting is the basis for application-wide font-scaling. A value
* of 0 means to use the font-size as set by the application. Other values
* between @ref baseFontSizeMin and @ref baseFontSizeMax enforce
* font-scaling.
*
* @sa GCText.fontSize baseFontSizeMin baseFontSizeMax
*/
Q_PROPERTY(int baseFontSize READ baseFontSize WRITE setBaseFontSize NOTIFY baseFontSizeChanged)
+ /**
+ * Stores the background music volume set by the user.
+ */
+ Q_PROPERTY(qreal backgroundMusicVolume READ backgroundMusicVolume WRITE setBackgroundMusicVolume NOTIFY backgroundMusicVolumeChanged)
+
+ /**
+ * Stores the audio effects volume set by the user.
+ */
+ Q_PROPERTY(qreal audioEffectsVolume READ audioEffectsVolume WRITE setAudioEffectsVolume NOTIFY audioEffectsVolumeChanged)
+
/**
* Minimum allowed value for font-scaling.
*
* Constant value: -7
*/
Q_PROPERTY(int baseFontSizeMin READ baseFontSizeMin CONSTANT)
/**
* Maximum allowed value for font-scaling.
*
* Constant value: +7
*/
Q_PROPERTY(int baseFontSizeMax READ baseFontSizeMax CONSTANT)
// admin group
/**
* Base-URL for resource downloads.
*
* @sa DownloadManager
*/
Q_PROPERTY(QString downloadServerUrl READ downloadServerUrl WRITE setDownloadServerUrl NOTIFY downloadServerUrlChanged)
/**
* Path where resources are downloaded and stored.
*
* @sa DownloadManager
*/
Q_PROPERTY(QString cachePath READ cachePath WRITE setCachePath NOTIFY cachePathChanged)
/**
* Return the platform specific path for storing data shared between apps
*
* On Android: /storage/emulated/0/GCompris (>= Android 4.2),
* /storage/sdcard0/GCompris (< Android 4.2)
* On Linux: $HOME/local/share/GCompris
*/
Q_PROPERTY(QString userDataPath READ userDataPath WRITE setUserDataPath NOTIFY userDataPathChanged)
/**
* Define the renderer used.
* Either openGL or software renderer (only for Qt >= 5.8)
*/
Q_PROPERTY(QString renderer READ renderer WRITE setRenderer NOTIFY rendererChanged)
+
+ /**
+ * Stores the filtered background music playlist by the user.
+ */
+ Q_PROPERTY(QStringList filteredBackgroundMusic READ filteredBackgroundMusic WRITE setFilteredBackgroundMusic NOTIFY filteredBackgroundMusicChanged)
// internal group
Q_PROPERTY(quint32 exeCount READ exeCount WRITE setExeCount NOTIFY exeCountChanged)
// keep last version ran. If different than ApplicationInfo.GCVersionCode(), it means a new version is running
Q_PROPERTY(int lastGCVersionRan READ lastGCVersionRan WRITE setLastGCVersionRan NOTIFY lastGCVersionRanChanged)
// no group
Q_PROPERTY(bool isBarHidden READ isBarHidden WRITE setBarHidden NOTIFY barHiddenChanged)
public:
/// @cond INTERNAL_DOCS
explicit ApplicationSettings(const QString &configPath = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)
+ "/gcompris/" + GCOMPRIS_APPLICATION_NAME + ".conf", QObject *parent = 0);
virtual ~ApplicationSettings();
// It is not recommended to create a singleton of Qml Singleton registered
// object but we could not found a better way to let us access ApplicationInfo
// on the C++ side. All our test shows that it works.
static ApplicationSettings *getInstance() {
if(!m_instance) {
m_instance = new ApplicationSettings();
}
return m_instance;
}
static QObject *applicationSettingsProvider(QQmlEngine *engine,
QJSEngine *scriptEngine);
bool showLockedActivities() const { return m_showLockedActivities; }
void setShowLockedActivities(const bool newMode) {
m_showLockedActivities = newMode;
emit showLockedActivitiesChanged();
}
bool isAudioVoicesEnabled() const { return m_isAudioVoicesEnabled; }
void setIsAudioVoicesEnabled(const bool newMode) {
m_isAudioVoicesEnabled = newMode;
emit audioVoicesEnabledChanged();
}
bool isAudioEffectsEnabled() const { return m_isAudioEffectsEnabled; }
void setIsAudioEffectsEnabled(const bool newMode) {
m_isAudioEffectsEnabled = newMode;
emit audioEffectsEnabledChanged();
}
+ bool isBackgroundMusicEnabled() const { return m_isBackgroundMusicEnabled; }
+ void setIsBackgroundMusicEnabled(const bool newMode) {
+ m_isBackgroundMusicEnabled = newMode;
+ emit backgroundMusicEnabledChanged();
+ }
+
bool isFullscreen() const { return m_isFullscreen; }
void setFullscreen(const bool newMode) {
if(m_isFullscreen != newMode) {
m_isFullscreen = newMode;
emit fullscreenChanged();
}
}
quint32 previousHeight() const { return m_previousHeight; }
void setPreviousHeight(quint32 height) {
if(m_previousHeight != height) {
m_previousHeight = height;
emit previousHeightChanged();
}
}
quint32 previousWidth() const { return m_previousWidth; }
void setPreviousWidth(quint32 width) {
if(m_previousWidth != width) {
m_previousWidth = width;
emit previousWidthChanged();
}
}
bool isVirtualKeyboard() const { return m_isVirtualKeyboard; }
void setVirtualKeyboard(const bool newMode) {
m_isVirtualKeyboard = newMode;
emit virtualKeyboardChanged();
}
QString locale() const {
return m_locale;
}
void setLocale(const QString &newLocale) {
m_locale = newLocale;
emit localeChanged();
}
QString font() const { return m_font; }
void setFont(const QString &newFont) {
m_font = newFont;
emit fontChanged();
}
bool isEmbeddedFont() const { return m_isEmbeddedFont; }
void setIsEmbeddedFont(const bool newIsEmbeddedFont) {
m_isEmbeddedFont = newIsEmbeddedFont;
emit embeddedFontChanged();
}
quint32 fontCapitalization() const { return m_fontCapitalization; }
void setFontCapitalization(quint32 newFontCapitalization) {
m_fontCapitalization = newFontCapitalization;
emit fontCapitalizationChanged();
}
qreal fontLetterSpacing() const { return m_fontLetterSpacing; }
void setFontLetterSpacing(qreal newFontLetterSpacing) {
m_fontLetterSpacing = newFontLetterSpacing;
emit fontLetterSpacingChanged();
}
qreal fontLetterSpacingMin() const { return m_fontLetterSpacingMin; }
qreal fontLetterSpacingMax() const { return m_fontLetterSpacingMax; }
bool isAutomaticDownloadsEnabled() const;
void setIsAutomaticDownloadsEnabled(const bool newIsAutomaticDownloadsEnabled);
quint32 filterLevelMin() const { return m_filterLevelMin; }
void setFilterLevelMin(const quint32 newFilterLevelMin) {
m_filterLevelMin = newFilterLevelMin;
emit filterLevelMinChanged();
}
quint32 filterLevelMax() const { return m_filterLevelMax; }
void setFilterLevelMax(const quint32 newFilterLevelMax) {
m_filterLevelMax = newFilterLevelMax;
emit filterLevelMaxChanged();
}
bool isDemoMode() const { return m_isDemoMode; }
void setDemoMode(const bool newMode);
QString codeKey() const { return m_codeKey; }
void setCodeKey(const QString &newCodeKey) {
m_codeKey = newCodeKey;
emit codeKeyChanged();
}
/**
* @brief activationMode
* @return 0: no, 1: inapp, 2: internal
*/
quint32 activationMode() const { return m_activationMode; }
bool isKioskMode() const { return m_isKioskMode; }
void setKioskMode(const bool newMode) {
m_isKioskMode = newMode;
emit kioskModeChanged();
}
/**
* Check validity of the activation code
* @param code An activation code to check
* @returns 0 if the code is not valid or we don't know yet
* 1 if the code is valid but out of date
* 2 if the code is valid and under 2 years
*/
Q_INVOKABLE uint checkActivationCode(const QString &code);
/**
* Check Payment API
* Call a payment system to sync our demoMode state with it
*/
void checkPayment();
// Called by the payment system
void bought(const bool isBought) {
if(m_isDemoMode != !isBought) {
m_isDemoMode = !isBought;
emit demoModeChanged();
}
}
bool sectionVisible() const { return m_sectionVisible; }
void setSectionVisible(const bool newMode) {
qDebug() << "c++ setSectionVisible=" << newMode;
m_sectionVisible = newMode;
emit sectionVisibleChanged();
}
QString wordset() const { return m_wordset; }
void setWordset(const QString &newWordset) {
m_wordset = newWordset;
emit wordsetChanged();
}
QString downloadServerUrl() const { return m_downloadServerUrl; }
void setDownloadServerUrl(const QString &newDownloadServerUrl) {
m_downloadServerUrl = newDownloadServerUrl;
emit downloadServerUrlChanged();
}
QString cachePath() const { return m_cachePath; }
void setCachePath(const QString &newCachePath) {
m_cachePath = newCachePath;
emit cachePathChanged();
}
QString userDataPath() const { return m_userDataPath; }
void setUserDataPath(const QString &newUserDataPath) {
m_userDataPath = newUserDataPath;
emit userDataPathChanged();
}
quint32 exeCount() const { return m_exeCount; }
void setExeCount(const quint32 newExeCount) {
m_exeCount = newExeCount;
emit exeCountChanged();
}
bool isBarHidden() const { return m_isBarHidden; }
void setBarHidden(const bool newBarHidden) {
m_isBarHidden = newBarHidden;
emit barHiddenChanged();
}
int baseFontSize() const { return m_baseFontSize; }
void setBaseFontSize(const int newBaseFontSize) {
m_baseFontSize = qMax(qMin(newBaseFontSize, baseFontSizeMax()), baseFontSizeMin());
emit baseFontSizeChanged();
}
int baseFontSizeMin() const { return m_baseFontSizeMin; }
int baseFontSizeMax() const { return m_baseFontSizeMax; }
+ qreal backgroundMusicVolume() const { return m_backgroundMusicVolume; }
+ void setBackgroundMusicVolume(const qreal newBackgroundMusicVolume) {
+ m_backgroundMusicVolume = newBackgroundMusicVolume;
+ emit backgroundMusicVolumeChanged();
+ }
+
+ qreal audioEffectsVolume() const { return m_audioEffectsVolume; }
+ void setAudioEffectsVolume(const qreal newAudioEffectsVolume) {
+ m_audioEffectsVolume = newAudioEffectsVolume;
+ emit audioEffectsVolumeChanged();
+ }
+
int lastGCVersionRan() const { return m_lastGCVersionRan; }
void setLastGCVersionRan(const int newLastGCVersionRan) {
m_lastGCVersionRan = newLastGCVersionRan;
emit lastGCVersionRanChanged();
}
QString renderer() const { return m_renderer; }
void setRenderer(const QString &newRenderer) {
m_renderer = newRenderer;
emit rendererChanged();
}
+
+ QStringList filteredBackgroundMusic() const { return m_filteredBackgroundMusic; }
+ void setFilteredBackgroundMusic(const QStringList &newFilteredBackgroundMusic) {
+ m_filteredBackgroundMusic = newFilteredBackgroundMusic;
+ emit filteredBackgroundMusicChanged();
+ }
/**
* Check if we use the external wordset for activity based on lang_api
* @returns true if wordset is loaded
* false if wordset is not loaded
*/
Q_INVOKABLE bool useExternalWordset();
protected slots:
Q_INVOKABLE void notifyShowLockedActivitiesChanged();
Q_INVOKABLE void notifyAudioVoicesEnabledChanged();
Q_INVOKABLE void notifyAudioEffectsEnabledChanged();
+ Q_INVOKABLE void notifyBackgroundMusicEnabledChanged();
Q_INVOKABLE void notifyFullscreenChanged();
Q_INVOKABLE void notifyPreviousHeightChanged();
Q_INVOKABLE void notifyPreviousWidthChanged();
Q_INVOKABLE void notifyVirtualKeyboardChanged();
Q_INVOKABLE void notifyLocaleChanged();
Q_INVOKABLE void notifyFontChanged();
Q_INVOKABLE void notifyFontCapitalizationChanged();
Q_INVOKABLE void notifyFontLetterSpacingChanged();
Q_INVOKABLE void notifyEmbeddedFontChanged();
Q_INVOKABLE void notifyAutomaticDownloadsEnabledChanged();
Q_INVOKABLE void notifyFilterLevelMinChanged();
Q_INVOKABLE void notifyFilterLevelMaxChanged();
Q_INVOKABLE void notifyDemoModeChanged();
Q_INVOKABLE void notifyCodeKeyChanged();
Q_INVOKABLE void notifyKioskModeChanged();
Q_INVOKABLE void notifySectionVisibleChanged();
Q_INVOKABLE void notifyWordsetChanged();
+ Q_INVOKABLE void notifyFilteredBackgroundMusicChanged();
+ Q_INVOKABLE void notifyBackgroundMusicVolumeChanged();
+ Q_INVOKABLE void notifyAudioEffectsVolumeChanged();
Q_INVOKABLE void notifyDownloadServerUrlChanged();
Q_INVOKABLE void notifyCachePathChanged();
Q_INVOKABLE void notifyUserDataPathChanged();
Q_INVOKABLE void notifyExeCountChanged();
Q_INVOKABLE void notifyLastGCVersionRanChanged();
Q_INVOKABLE void notifyRendererChanged();
Q_INVOKABLE void notifyBarHiddenChanged();
public slots:
Q_INVOKABLE bool isFavorite(const QString &activity);
Q_INVOKABLE void setFavorite(const QString &activity, bool favorite);
Q_INVOKABLE void setCurrentLevels(const QString &activity, const QStringList &level);
Q_INVOKABLE QStringList currentLevels(const QString &activity);
Q_INVOKABLE void saveBaseFontSize();
/// @endcond
/**
* Stores per-activity configuration @p data for @p activity.
*
* @param activity Name of the activity that wants to persist settings.
* @param data Map of configuration data so save.
*/
Q_INVOKABLE void saveActivityConfiguration(const QString &activity, const QVariantMap &data);
/**
* Loads per-activity configuration data for @p activity.
*
* @param activity Name of the activity that wants to persist settings.
* @returns Map of configuration items.
*/
Q_INVOKABLE QVariantMap loadActivityConfiguration(const QString &activity);
/**
* Loads per-activity progress using the default "progress" key.
*
* @param activity Name of the activity to load progress for.
* @returns Last started level of the activity, 0 if none saved.
*/
Q_INVOKABLE int loadActivityProgress(const QString &activity);
/**
* Saves per-activity progress using the default "progress" key.
*
* @param activity Name of the activity that wants to persist settings.
* @param progress Last started level to save as progress value.
*/
Q_INVOKABLE void saveActivityProgress(const QString &activity, int progress);
signals:
void showLockedActivitiesChanged();
void audioVoicesEnabledChanged();
void audioEffectsEnabledChanged();
+ void backgroundMusicEnabledChanged();
void fullscreenChanged();
void previousHeightChanged();
void previousWidthChanged();
void virtualKeyboardChanged();
void localeChanged();
void fontChanged();
void fontCapitalizationChanged();
void fontLetterSpacingChanged();
void embeddedFontChanged();
void automaticDownloadsEnabledChanged();
void filterLevelMinChanged();
void filterLevelMaxChanged();
void demoModeChanged();
void codeKeyChanged();
void kioskModeChanged();
void sectionVisibleChanged();
void wordsetChanged();
void baseFontSizeChanged();
+ void filteredBackgroundMusicChanged();
+ void backgroundMusicVolumeChanged();
+ void audioEffectsVolumeChanged();
void downloadServerUrlChanged();
void cachePathChanged();
void userDataPathChanged();
void exeCountChanged();
void lastGCVersionRanChanged();
void rendererChanged();
void barHiddenChanged();
protected:
static ApplicationSettings *m_instance;
private:
// Update in configuration the couple {key, value} in the group.
template<class T> void updateValueInConfig(const QString& group,
const QString& key, const T& value);
bool m_showLockedActivities;
bool m_isAudioVoicesEnabled;
bool m_isAudioEffectsEnabled;
+ bool m_isBackgroundMusicEnabled;
bool m_isFullscreen;
quint32 m_previousHeight;
quint32 m_previousWidth;
bool m_isVirtualKeyboard;
bool m_isAutomaticDownloadsEnabled;
bool m_isEmbeddedFont;
quint32 m_fontCapitalization;
qreal m_fontLetterSpacing;
quint32 m_filterLevelMin;
quint32 m_filterLevelMax;
bool m_defaultCursor;
bool m_noCursor;
QString m_locale;
QString m_font;
bool m_isDemoMode;
QString m_codeKey;
quint32 m_activationMode;
bool m_isKioskMode;
bool m_sectionVisible;
QString m_wordset;
+ QStringList m_filteredBackgroundMusic;
+ qreal m_backgroundMusicVolume;
+ qreal m_audioEffectsVolume;
int m_baseFontSize;
const int m_baseFontSizeMin;
const int m_baseFontSizeMax;
const qreal m_fontLetterSpacingMin;
const qreal m_fontLetterSpacingMax;
QString m_downloadServerUrl;
QString m_cachePath;
QString m_userDataPath;
quint32 m_exeCount;
int m_lastGCVersionRan;
QString m_renderer;
bool m_isBarHidden;
QSettings m_config;
};
#endif // APPLICATIONSETTINGS_H
diff --git a/src/core/Bonus.qml b/src/core/Bonus.qml
index 51add58ae..8a9117279 100644
--- a/src/core/Bonus.qml
+++ b/src/core/Bonus.qml
@@ -1,204 +1,222 @@
/* GCompris - Bonus.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
// Requires the global property in the scope:
// property GCAudio audioEffects, audioVoices
/**
* A QML component providing user feedback upon winning/loosing.
* @ingroup components
*
* Usually triggered by an activity when a user has won/lost a level via the
* @ref good / @ref bad methods. Bonus then provides visual and auditive
* feedback to the user and emits the @ref win / @ref loose signals when
* finished.
*
- * Maintains a list of possible audio voice resources to be playebd back
+ * Maintains a list of possible audio voice resources to be played back
* upon winning/loosing events, and selects randomly from them when triggered.
*
* @inherit QtQuick.Image
*/
Image {
id: bonus
/**
* type:string
* Url of the audio resource to be used as winning sound.
*/
property string winSound: url + "sounds/bonus.wav"
/**
* type:string
* Url of the audio resource to be used as loosing sound.
*/
property string looseSound
/**
* type:int
* Interval in milliseconds after which the bonus will be played (default is 500ms)
*/
property alias interval: timer.interval
/**
* Emitted when the bonus starts
*/
signal start
/**
* Emitted when the bonus stops
*/
signal stop
/**
* Emitted when the win event is over.
*
* After the animation has finished.
*/
signal win
/**
* Emitted when the loose event is over.
*
* After the animation has finished.
*/
signal loose
/// @cond INTERNAL_DOCS
property string url: "qrc:/gcompris/src/core/resource/"
property bool isWin: false
property var winVoices: [
"voices-$CA/$LOCALE/misc/congratulation.$CA",
"voices-$CA/$LOCALE/misc/great.$CA",
"voices-$CA/$LOCALE/misc/good.$CA",
"voices-$CA/$LOCALE/misc/awesome.$CA",
"voices-$CA/$LOCALE/misc/fantastic.$CA",
"voices-$CA/$LOCALE/misc/waytogo.$CA",
"voices-$CA/$LOCALE/misc/super.$CA",
"voices-$CA/$LOCALE/misc/perfect.$CA"
]
property var looseVoices: [
+ "voices-$CA/$LOCALE/misc/try_again.$CA",
"voices-$CA/$LOCALE/misc/check_answer.$CA"
]
+ readonly property int tryAgain: 0
+ readonly property int checkAnswer: 1
/// @endcond
+ property int nextAudioIndex: 0
/**
* type:bool
* True between the moment we have the win/lose signal emitted and the
* bonus image is no more displayed
*/
property bool isPlaying: animation.running || timer.running
visible: true
opacity: 0
anchors.fill: parent
anchors.margins: 50 * ApplicationInfo.ratio
fillMode: Image.PreserveAspectFit
z: 1000
sourceSize.width: parent.width * 0.5
/**
* Triggers win feedback.
*
* Tries to play back a voice resource for winning, if not found fall back
* to the winSound.
*
* @param name Type of win image to show.
* Possible values are "flower", "gnu", "lion", "note", "smiley", "tux"
*/
function good(name) {
source = url + "bonus/" + name + "_good.svg"
isWin = true
timer.start()
}
/**
* Triggers loose feedback.
*
* Tries to play back a voice resource for loosing, if not found fall back
* to the looseSound.
*
* @param name Type of win image to show.
* Possible values are "flower", "gnu", "lion", "note", "smiley", "tux"
*/
- function bad(name) {
+ function bad(name, audioIndex) {
source = url + "bonus/" + name + "_bad.svg"
isWin = false;
timer.start()
+ if(audioIndex) {
+ nextAudioIndex = audioIndex
+ }
+ else {
+ nextAudioIndex = bonus.tryAgain
+ }
}
/**
* Private: Triggers win feedback after the timer completion
*/
function _good() {
if(!audioVoices.play(
ApplicationInfo.getAudioFilePath(
winVoices[Math.floor(Math.random()*winVoices.length)])))
if(winSound)
audioEffects.play(winSound)
start()
animation.start()
}
/**
* Private: Triggers loose feedback after the timer completion.
*/
function _bad(name) {
- if(!audioVoices.play(
- ApplicationInfo.getAudioFilePath(
- looseVoices[Math.floor(Math.random()*looseVoices.length)])))
+ var audio = ApplicationInfo.getAudioFilePath(
+ looseVoices[nextAudioIndex])
+ // Defaults to "check answer" if required audio does not exist
+ if(!file.exists(audio)) {
+ audio = ApplicationInfo.getAudioFilePath(
+ looseVoices[bonus.checkAnswer])
+ }
+ if(!audioVoices.play(audio))
if(looseSound)
audioEffects.play(looseSound)
start()
animation.start()
}
SequentialAnimation {
id: animation
NumberAnimation {
target: bonus
property: "opacity"
from: 0; to: 1.0
duration: 1000
easing.type: Easing.InOutQuad
}
NumberAnimation {
target: bonus
property: "opacity"
from: 1.0; to: 0
duration: 500
easing.type: Easing.InOutQuad
}
onStopped: {
bonus.stop()
isWin ? win() : loose()
}
}
+ File {
+ id: file
+ }
// It is useful to launch the bonus after a delay to let the children
// appreciate the completed level
Timer {
id: timer
interval: 500
onTriggered: isWin ? bonus._good() : bonus._bad()
}
}
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index b0229178d..20cb38c9d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,357 +1,358 @@
include(qt_helper)
configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY)
if(WITH_KIOSK_MODE)
add_definitions(-DWITH_KIOSK_MODE)
endif()
if(SAILFISHOS)
add_definitions(-DSAILFISHOS)
endif()
if(ANDROID)
# needed since ECM 5.45 (https://bugs.kde.org/show_bug.cgi?id=394042)
include_directories(SYSTEM
"${CMAKE_SYSROOT}/usr/include"
)
endif()
set(gcompris_SRCS
- ActivityInfo.cpp
- ActivityInfo.h
- ActivityInfoTree.cpp
- ActivityInfoTree.h
- ApplicationInfo.cpp
- ApplicationInfo.h
- ApplicationSettings.cpp
- ApplicationSettings.h
- File.cpp
- File.h
- Directory.cpp
- Directory.h
- DownloadManager.cpp
- DownloadManager.h
- GComprisPlugin.cpp
- GComprisPlugin.h
- main.cpp
- config.h.in
- synth/ADSRenvelope.cpp
- synth/ADSRenvelope.h
- synth/GSynth.cpp
- synth/GSynth.h
- synth/linearSynthesis.cpp
- synth/linearSynthesis.h
- synth/modulation.cpp
- synth/modulation.h
- synth/generator.cpp
- synth/generator.h
- synth/preset.h
- synth/preset.cpp
- synth/waveform.cpp
- synth/waveform.h
+ ActivityInfo.cpp
+ ActivityInfo.h
+ ActivityInfoTree.cpp
+ ActivityInfoTree.h
+ ApplicationInfo.cpp
+ ApplicationInfo.h
+ ApplicationSettings.cpp
+ ApplicationSettings.h
+ File.cpp
+ File.h
+ Directory.cpp
+ Directory.h
+ DownloadManager.cpp
+ DownloadManager.h
+ GComprisPlugin.cpp
+ GComprisPlugin.h
+ main.cpp
+ config.h.in
+ synth/ADSRenvelope.cpp
+ synth/ADSRenvelope.h
+ synth/GSynth.cpp
+ synth/GSynth.h
+ synth/linearSynthesis.cpp
+ synth/linearSynthesis.h
+ synth/modulation.cpp
+ synth/modulation.h
+ synth/generator.cpp
+ synth/generator.h
+ synth/preset.h
+ synth/preset.cpp
+ synth/waveform.cpp
+ synth/waveform.h
)
if(ANDROID)
list(APPEND gcompris_SRCS ApplicationAndroid.cpp)
else()
list(APPEND gcompris_SRCS ApplicationSettingsDefault.cpp ApplicationInfoDefault.cpp)
endif()
# Resources
set(GCOMPRIS_RESOURCES "${PROJECT_SOURCE_DIR}/installer")
if(CMAKE_HOST_WIN32)
set(gcompris_icon GCompris.ico)
set(gcompris_RES
${GCOMPRIS_RESOURCES}/${gcompris_icon}
- GCompris.rc
+ GCompris.rc
)
elseif(CMAKE_HOST_APPLE)
set(gcompris_icon GCompris.icns)
set(gcompris_RES ${GCOMPRIS_RESOURCES}/${gcompris_icon})
set_source_files_properties(${gcompris_RES} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
endif()
set(used_qt_modules Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Multimedia Qt5::Core Qt5::Svg Qt5::Xml Qt5::XmlPatterns Qt5::Sensors)
if(ANDROID)
add_library(${GCOMPRIS_EXECUTABLE_NAME} SHARED ${gcompris_SRCS})
set(used_qt_modules ${used_qt_modules} Qt5::AndroidExtras)
elseif(CMAKE_HOST_APPLE)
add_executable(${GCOMPRIS_EXECUTABLE_NAME} MACOSX_BUNDLE ${gcompris_SRCS} ${gcompris_RES})
elseif(CMAKE_HOST_WIN32)
add_executable(${GCOMPRIS_EXECUTABLE_NAME} WIN32 ${gcompris_SRCS} ${gcompris_RES})
elseif(SAILFISHOS)
add_executable(${GCOMPRIS_EXECUTABLE_NAME} ${gcompris_SRCS} ${gcompris_RES})
set(used_qt_modules ${used_qt_modules} Qt5::Widgets)
else()
add_executable(${GCOMPRIS_EXECUTABLE_NAME} ${gcompris_SRCS} ${gcompris_RES})
endif()
# only build the lib for testing purpose
if(BUILD_TESTING)
add_library(gcompris_core SHARED ${gcompris_SRCS})
target_link_libraries(gcompris_core ${used_qt_modules})
endif()
target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} ${used_qt_modules})
GCOMPRIS_ADD_RCC(core *.qml *.js resource/*.${COMPRESSED_AUDIO} resource/*.gif resource/*.png resource/*.svg resource/bonus/* resource/sounds/* resource/fonts/* qmldir COPYING)
# Installation
# ============
install(TARGETS ${GCOMPRIS_EXECUTABLE_NAME}
ARCHIVE DESTINATION bin
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
BUNDLE DESTINATION .)
if(BUILD_STANDALONE)
# Qt plugins to install
set(_qt_plugins "")
if(NOT SAILFISHOS)
list(APPEND _qt_plugins Qt5::QJpegPlugin)
endif()
if(APPLE)
list(APPEND _qt_plugins Qt5::QTgaPlugin Qt5::QTiffPlugin Qt5::QCocoaIntegrationPlugin)
elseif(WIN32)
list(APPEND _qt_plugins Qt5::QWindowsIntegrationPlugin Qt5::QWindowsAudioPlugin Qt5::AudioCaptureServicePlugin Qt5::DSServicePlugin)
elseif(UNIX AND NOT ANDROID AND NOT SAILFISHOS)
list(APPEND _qt_plugins Qt5::QXcbIntegrationPlugin Qt5::QXcbEglIntegrationPlugin Qt5::QXcbGlxIntegrationPlugin Qt5::QAlsaPlugin Qt5::QPulseAudioPlugin)
endif()
list(APPEND _qt_plugins Qt5::genericSensorPlugin Qt5::QtSensorGesturePlugin Qt5::QShakeSensorGesturePlugin)
# Qml plugins to install
if(WIN32)
set(_lib_prefix "")
else()
set(_lib_prefix "lib")
endif()
set(_qt_plugins2 imageformats/${_lib_prefix}qsvg)
if(UNIX AND NOT ANDROID AND NOT APPLE AND NOT SAILFISHOS)
list(APPEND _qt_plugins2 mediaservice/${_lib_prefix}gstaudiodecoder
mediaservice/${_lib_prefix}gstcamerabin
mediaservice/${_lib_prefix}gstmediacapture
mediaservice/${_lib_prefix}gstmediaplayer)
elseif(APPLE)
list(APPEND _qt_plugins2 audio/${_lib_prefix}qtaudio_coreaudio
mediaservice/${_lib_prefix}qavfmediaplayer
mediaservice/${_lib_prefix}qtmedia_audioengine
mediaservice/${_lib_prefix}qavfcamera)
endif()
-
+
set(_qml_plugins
QtGraphicalEffects/${_lib_prefix}qtgraphicaleffectsplugin
QtGraphicalEffects/private/${_lib_prefix}qtgraphicaleffectsprivate
QtQuick/Window.2/${_lib_prefix}windowplugin
QtQuick/Particles.2/${_lib_prefix}particlesplugin
QtQuick.2/${_lib_prefix}qtquick2plugin
QtMultimedia/${_lib_prefix}declarative_multimedia
QtSensors/${_lib_prefix}declarative_sensors)
-
+
if(NOT SAILFISHOS)
list(APPEND _qml_plugins
QtQuick/Controls/${_lib_prefix}qtquickcontrolsplugin
QtQuick/Layouts/${_lib_prefix}qquicklayoutsplugin)
endif()
set(GCOMPRIS_OTHER_LIBS)
if(APPLE)
set(_app gcompris-qt.app)
set(_qtconf_destdir ${_app}/Contents/Resources)
set(_qt_plugins_destdir ${_app}/Contents/plugins)
set(_qt_qml_destdir ${_app}/Contents/qml)
set(GCOMPRIS_BUNDLE "\${CMAKE_INSTALL_PREFIX}/${_app}")
set_target_properties(gcompris-qt PROPERTIES
MACOSX_BUNDLE_INFO_STRING "GCompris, Educational game for children 2 to 10"
MACOSX_BUNDLE_ICON_FILE "${gcompris_icon}"
MACOSX_BUNDLE_GUI_IDENTIFIER "net.gcompris"
MACOSX_BUNDLE_LONG_VERSION_STRING "${GCOMPRIS_MAJOR_VERSION}.${GCOMPRIS_MINOR_VERSION}.${GCOMPRIS_PATCH_VERSION}"
MACOSX_BUNDLE_BUNDLE_NAME "gcompris-qt"
MACOSX_BUNDLE_SHORT_VERSION_STRING "${GCOMPRIS_VERSION}"
MACOSX_BUNDLE_BUNDLE_VERSION "${GCOMPRIS_VERSION}"
MACOSX_BUNDLE_COPYRIGHT "GPL License, Copyright 2000-2019 Timothee Giet and Others.")
set_source_files_properties(${GCOMPRIS_RESOURCES}/${gcompris_icon} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
else()
set(_qtconf_destdir bin)
set(_qt_plugins_destdir bin/plugins)
set(_qt_qml_destdir bin/qml)
if(CMAKE_HOST_WIN32)
set(GCOMPRIS_BUNDLE "\${CMAKE_INSTALL_PREFIX}/bin/${GCOMPRIS_EXECUTABLE_NAME}.exe")
else()
set(GCOMPRIS_BUNDLE "\${CMAKE_INSTALL_PREFIX}/bin/${GCOMPRIS_EXECUTABLE_NAME}")
endif()
endif()
# install qt.conf file
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/qt.conf DESTINATION ${_qtconf_destdir})
# install qt plugins
foreach(_plugin ${_qt_plugins})
installQtPlugin(${_plugin} ${_qt_plugins_destdir} _lib)
list(APPEND GCOMPRIS_OTHER_LIBS ${_lib})
endforeach()
foreach(_plugin ${_qt_plugins2})
if(APPLE)
installQtPlugin2(${_plugin} ${_qt_plugins_destdir}/../Plugins _lib)
else()
installQtPlugin2(${_plugin} ${_qt_plugins_destdir} _lib)
endif()
list(APPEND GCOMPRIS_OTHER_LIBS ${_lib})
endforeach()
# install qml plugins
foreach(_plugin ${_qml_plugins})
installQmlPlugin(${_plugin} ${_qt_qml_destdir} _lib)
list(APPEND GCOMPRIS_OTHER_LIBS ${_lib})
endforeach()
## install QtGraphicalEffects (which is not a lib but only qml files)
# BUT, actually there are some libs in it, and this does not work on APPLE. Moved to _qml_plugins instead
#
#set(_qml_subdir QtGraphicalEffects)
#getQtQmlPath(_qt_qml_path)
#install(DIRECTORY ${_qt_qml_path}/QtGraphicalEffects DESTINATION ${_qt_qml_destdir})
# Fix for Linux 'make package' that fails to link with libicu; also package OpenSSL libs from system
if(UNIX AND NOT APPLE AND NOT SAILFISHOS AND NOT ANDROID)
add_library( libicudata SHARED IMPORTED )
- FILE(GLOB LIBICUDATA_SO "${Qt5_DIR}/../../libicudata.so.[0-9][0-9]")
- if ("${LIBICUDATA_SO}" STREQUAL "")
- FILE(GLOB LIBICUDATA_SO "/usr/lib/*/libicudata.so.[0-9][0-9]")
+ file(GLOB LIBICUDATA_SO "${Qt5_DIR}/../../libicudata.so.[0-9][0-9]")
+ if("${LIBICUDATA_SO}" STREQUAL "")
+ file(GLOB LIBICUDATA_SO "/usr/lib/*/libicudata.so.[0-9][0-9]")
endif()
set_target_properties( libicudata PROPERTIES IMPORTED_LOCATION ${LIBICUDATA_SO} )
add_library( libicui18n SHARED IMPORTED )
- FILE(GLOB LIBICUI18N_SO "${Qt5_DIR}/../../libicui18n.so.[0-9][0-9]")
- if ("${LIBICUI18N_SO}" STREQUAL "")
- FILE(GLOB LIBICUI18N_SO "/usr/lib/*/libicui18n.so.[0-9][0-9]")
+ file(GLOB LIBICUI18N_SO "${Qt5_DIR}/../../libicui18n.so.[0-9][0-9]")
+ if("${LIBICUI18N_SO}" STREQUAL "")
+ file(GLOB LIBICUI18N_SO "/usr/lib/*/libicui18n.so.[0-9][0-9]")
endif()
set_target_properties( libicui18n PROPERTIES IMPORTED_LOCATION ${LIBICUI18N_SO} )
add_library( libicuuc SHARED IMPORTED )
- FILE(GLOB LIBICUUC_SO "${Qt5_DIR}/../../libicuuc.so.[0-9][0-9]")
- if ("${LIBICUUC_SO}" STREQUAL "")
- FILE(GLOB LIBICUUC_SO "/usr/lib/*/libicuuc.so.[0-9][0-9]")
+ file(GLOB LIBICUUC_SO "${Qt5_DIR}/../../libicuuc.so.[0-9][0-9]")
+ if("${LIBICUUC_SO}" STREQUAL "")
+ file(GLOB LIBICUUC_SO "/usr/lib/*/libicuuc.so.[0-9][0-9]")
endif()
set_target_properties( libicuuc PROPERTIES IMPORTED_LOCATION ${LIBICUUC_SO} )
- TARGET_LINK_LIBRARIES(${GCOMPRIS_EXECUTABLE_NAME} libicudata libicui18n libicuuc)
+ target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} libicudata libicui18n libicuuc)
# package installed OpenSSL libraries
install(FILES "${OPENSSL_SSL_LIBRARY}" DESTINATION bin)
install(FILES "${OPENSSL_CRYPTO_LIBRARY}" DESTINATION bin)
install(FILES "${OPENSSL_SSL_LIBRARY}.10" DESTINATION bin)
install(FILES "${OPENSSL_CRYPTO_LIBRARY}.10" DESTINATION bin)
install(FILES "${OPENSSL_SSL_LIBRARY}.1.0.2k" DESTINATION bin)
install(FILES "${OPENSSL_CRYPTO_LIBRARY}.1.0.2k" DESTINATION bin)
- TARGET_LINK_LIBRARIES(${GCOMPRIS_EXECUTABLE_NAME} OpenSSL::SSL OpenSSL::Crypto)
+ target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} OpenSSL::SSL OpenSSL::Crypto)
endif()
-
+
#Add OpenSSL support on Windows builds
if(WIN32)
if(MINGW)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
#64bit
set(OPENSSL_DLL_SUFFIX "-x64")
endif()
install(FILES "${Qt5_DIR}/../../../bin/libcrypto-1_1${OPENSSL_DLL_SUFFIX}.dll" DESTINATION bin)
install(FILES "${Qt5_DIR}/../../../bin/libssl-1_1${OPENSSL_DLL_SUFFIX}.dll" DESTINATION bin)
- else(MINGW) # appveyor
+ else() # appveyor
install(FILES "${OPENSSL_INCLUDE_DIR}/../libeay32.dll" DESTINATION bin)
install(FILES "${OPENSSL_INCLUDE_DIR}/../libssl32.dll" DESTINATION bin)
install(FILES "${OPENSSL_INCLUDE_DIR}/../ssleay32.dll" DESTINATION bin)
endif()
target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} OpenSSL::SSL OpenSSL::Crypto)
endif()
-endif(BUILD_STANDALONE)
+endif()
# Hack: do not fixup Qt and Qml plugins on Windows because fixup_bundle takes ages (cmake bug ?) -> Johnny : we need this even if it takes time because some required dependencies are pulled here
#if(WIN32) set(GCOMPRIS_OTHER_LIBS "") endif()
# install fixup_bundle script to resolve and fixup runtime dependencies
if(BUILD_STANDALONE AND NOT ANDROID)
configure_file(${CMAKE_SOURCE_DIR}/cmake/FixBundle.cmake.in FixBundle.cmake)
install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake)
# install a startup script for linux bundle
if(UNIX AND NOT APPLE AND NOT SAILFISHOS)
install(PROGRAMS ../../tools/gcompris-qt.sh DESTINATION bin)
endif()
endif()
if(WIN32 AND NOT MINGW)
# install libEGL.dll, libGLESv2.dll, d3dcompiler_47.dll from Qt installation. Not sure if there is a clean way to get them...
# Qt5_Dir is like C:/Qt/Qt5.5.1/5.5/mingw492_32/lib/cmake/Qt5
install(FILES ${Qt5_DIR}/../../../bin/libEGL.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/libGLESv2.dll DESTINATION bin)
install(FILES ${Qt5_DIR}/../../../bin/d3dcompiler_47.dll DESTINATION bin)
target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} ${Qt5_DIR}/../../libEGL.lib)
target_link_libraries(${GCOMPRIS_EXECUTABLE_NAME} ${Qt5_DIR}/../../libGLESv2.lib)
install(FILES ${Qt5_DIR}/../../../bin/opengl32sw.dll DESTINATION bin)
# CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS contains visual c++ libraries
install(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION bin)
endif()
-
+
# Packaging
# =========
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GCompris is a high quality educational software suite, including a large number of activities for children aged 2 to 10.")
set(CPACK_PACKAGE_VERSION_MAJOR ${GCOMPRIS_MAJOR_VERSION})
set(CPACK_PACKAGE_VERSION_MINOR ${GCOMPRIS_MINOR_VERSION})
set(CPACK_PACKAGE_VERSION_PATCH ${GCOMPRIS_PATCH_VERSION})
set(CPACK_PACKAGE_VERSION ${GCOMPRIS_VERSION})
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README")
if(WIN32)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${GCOMPRIS_EXECUTABLE_NAME}-Qt")
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${GCOMPRIS_EXECUTABLE_NAME}-Qt")
set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/installer\\\\gcompris-header.bmp")
set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/installer\\\\GCompris-install.ico")
set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/installer\\\\GCompris-uninstall.ico")
+ set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${PROJECT_SOURCE_DIR}/installer\\\\welcome-page.bmp")
+ set(CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP "${PROJECT_SOURCE_DIR}/installer\\\\welcome-page.bmp")
set(CPACK_NSIS_EXECUTABLES_DIRECTORY "bin")
set(CPACK_PACKAGE_EXECUTABLES "${GCOMPRIS_EXECUTABLE_NAME};GCompris")
set(CPACK_CREATE_DESKTOP_LINKS "${GCOMPRIS_EXECUTABLE_NAME};GCompris")
set(CPACK_NSIS_URL_INFO_ABOUT "https:\\\\\\\\gcompris.net")
set(CPACK_NSIS_DISPLAY_NAME "GCompris Educational Software")
set(CPACK_NSIS_MUI_FINISHPAGE_RUN "${GCOMPRIS_EXECUTABLE_NAME}")
set(CPACK_PACKAGE_VENDOR "GCompris team")
# Create shortcuts in menu to be able to launch in software or opengl mode
list(APPEND CPACK_NSIS_CREATE_ICONS_EXTRA " CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\GCompris (Safe Mode).lnk' '$INSTDIR\\\\bin\\\\${GCOMPRIS_EXECUTABLE_NAME}.exe' '--software-renderer'")
list(APPEND CPACK_NSIS_CREATE_ICONS_EXTRA " CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\GCompris.lnk' '$INSTDIR\\\\bin\\\\${GCOMPRIS_EXECUTABLE_NAME}.exe' '--opengl-renderer'")
- string (REPLACE ";" "\n" CPACK_NSIS_CREATE_ICONS_EXTRA "${CPACK_NSIS_CREATE_ICONS_EXTRA}")
-
-else(WIN32)
+ string(REPLACE ";" "\n" CPACK_NSIS_CREATE_ICONS_EXTRA "${CPACK_NSIS_CREATE_ICONS_EXTRA}")
+else()
set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/GCompris64.png")
endif()
if(APPLE)
set(CPACK_GENERATOR "DragNDrop")
set(CPACK_DMG_DS_STORE "${GCOMPRIS_RESOURCES}/dmg_DS_Store")
set(CPACK_DMG_BACKGROUND_IMAGE "${GCOMPRIS_RESOURCES}/dmg_background.png")
elseif(WIN32)
set(CPACK_GENERATOR "NSIS")
elseif(SAILFISHOS)
configure_file(${PROJECT_SOURCE_DIR}/platforms/sailfishOS/harbour-gcompris-qt.spec.cmake ${CMAKE_BINARY_DIR}/harbour-gcompris-qt.spec @ONLY)
install(FILES ${PROJECT_SOURCE_DIR}/platforms/sailfishOS/harbour-gcompris-qt.desktop DESTINATION share/applications)
install(FILES ${PROJECT_SOURCE_DIR}/platforms/sailfishOS/harbour-gcompris-qt.png DESTINATION share/icons/hicolor/86x86/apps)
set(CPACK_RPM_PACKAGE_SUMMARY "gcompris-qt")
# BUILD_ARCH is either armv7hl or i486
set(CPACK_RPM_PACKAGE_ARCHITECTURE "${BUILD_ARCH}")
set(CPACK_RPM_PACKAGE_NAME "${GCOMPRIS_EXECUTABLE_NAME}")
set(CPACK_RPM_PACKAGE_VERSION "${GCOMPRIS_VERSION}")
set(CPACK_RPM_PACKAGE_LICENSED "GPLv3")
set(CPACK_RPM_PACKAGE_URL "https://www.gcompris.org")
set(CPACK_RPM_PACKAGE_DESCRIPTION "GCompris is a high quality educational software suite comprising of numerous activities for children aged 2 to 10.")
set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_BINARY_DIR}/harbour-gcompris-qt.spec")
set(CMAKE_INSTALL_PREFIX "/usr")
set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
set(CPACK_GENERATOR "RPM")
else()
set(CPACK_GENERATOR "STGZ")
endif()
include(CPack)
diff --git a/src/core/ChangeLog.qml b/src/core/ChangeLog.qml
index 87b22d852..b66112b99 100644
--- a/src/core/ChangeLog.qml
+++ b/src/core/ChangeLog.qml
@@ -1,96 +1,105 @@
/* GCompris - ChangeLog.qml
*
* Copyright (C) 2016 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
/**
* Container object with a list of all the changes by version.
* @ingroup infrastructure
*
*/
QtObject {
/**
* type: list
* List of changelog objects.
*
* A changelog object consists of the properties @c versionCode
* and an optional @c content (which changes have been added in this version).
* The activities added in this version are retrieved from the ActivityInfoTree and directly displayed.
*
*/
property var changelog: [
+ { "versionCode": 9700, "content": [qsTr("New sub-categories to organize activities"),
+ qsTr("Translation added for Macedonian."),
+ qsTr("New activities Programming Maze and Baby Tangram"),
+ qsTr("New background music and volume settings."),
+ qsTr("New speed setting in several activities."),
+ qsTr("New option in chess to display captured pieces."),
+ qsTr("New images in Colors, Advanced colors and Target game."),
+ qsTr("New voices for US English."),
+ qsTr("Many little fixes and improvements.")] },
{ "versionCode": 9600, "content": [qsTr("Translation updated for multiple languages (Breton, Brazilian Portuguese, Finnish...)."),
qsTr("Add Russian dataset for Click on letter activity."),
-qsTr("Lang activity now available in Dutch.")] },
+ qsTr("Lang activity now available in Dutch.")] },
{ "versionCode": 9500, "content": [qsTr("Merge Norwegian counties Nord-Trøndelag and Sør-Trøndelag into Trøndelag in geo-country activity."),
qsTr("Fix in braille activities where the cells start at 1, not 0."),
qsTr("Translation added for Basque, Hungarian and Malayalam."),
qsTr("Loading/saving of creations (Baby Wordprocessor, Balance Box and Piano Composition).")] },
{ "versionCode": 9100, "content": [qsTr("Many little fixes and improvements."), qsTr("Translations added for Scottish Gaelic.")] },
{ "versionCode": 9000, "content": [qsTr("License page added in configuration."), qsTr("Multiple changes on layouts to improve the ergonomy.")] },
{ "versionCode": 8000, "content": [qsTr("Lang activity now available in Polish, Swedish and Ukrainian.")] },
{ "versionCode": 7000, "content": [qsTr("Search feature.")] },
{ "versionCode": 6000, "content": [qsTr("A Changelog.")] },
{ "versionCode": 5200, "content": [qsTr("Many little fixes."), qsTr("Lang activity now available in French.")] },
{ "versionCode": 5000, "content": [qsTr("Adding a loading overlay to let the user know that some actions are taking place (loading an activity for example) and can take some seconds."), qsTr("Translations added for: Catalan (Valencian), Chinese Traditional, Finnish (92% translated), Russian (98% translated), Slovak (92% translated), Turkish.")] },
{ "versionCode": 4000, "content": [qsTr("Translations added for: Slovenian, German, Galician.")] }
]
function isNewerVersion(previousVersion, newVersion) {
return newVersion > previousVersion
}
function getLogBetween(previousVersion, newVersion) {
var filtered = changelog.filter(function filter(obj) {
return isNewerVersion(previousVersion, obj['versionCode'])
});
var output = "";
// Retrieve all the activities created between the two versions
ActivityInfoTree.filterCreatedWithinVersions(previousVersion, newVersion);
var activities = ActivityInfoTree.menuTree;
// display for each version an optional text ("content") then the new activities
filtered.map(function filter(obj) {
obj['versionCode'];
var version = (obj['versionCode'] / 10000).toFixed(2);
output += "<b>" + qsTr("Version %1:").arg(version) + "</b>";
output += "<ul>";
// display free text if exist
for(var i = 0; i < obj['content'].length; i++)
output += "<li>" + obj['content'][i] + "</li>";
// display the activity titles
for(var i in activities) {
var activity = activities[i];
if(activity.createdInVersion == obj['versionCode'] && activity.enabled) {
output += "<li>" + activity.title + "</li>";
}
}
output += "</ul>";
});
// restore menu context
ActivityInfoTree.filterByTag("favorite")
ActivityInfoTree.filterLockedActivities()
ActivityInfoTree.filterEnabledActivities()
return output
}
}
diff --git a/src/core/DownloadManager.cpp b/src/core/DownloadManager.cpp
index e4c95067e..312c0bb56 100644
--- a/src/core/DownloadManager.cpp
+++ b/src/core/DownloadManager.cpp
@@ -1,677 +1,684 @@
/* GCompris - DownloadManager.cpp
*
* Copyright (C) 2014 Holger Kaelberer <holger.k@elberer.de>
*
* Authors:
* Holger Kaelberer <holger.k@elberer.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include "DownloadManager.h"
#include "ApplicationSettings.h"
#include "ApplicationInfo.h"
#include <QFile>
#include <QDir>
#include <QResource>
#include <QStandardPaths>
#include <QMutexLocker>
#include <QNetworkConfiguration>
#include <QDirIterator>
#include <QtQml>
const QString DownloadManager::contentsFilename = QStringLiteral("Contents");
DownloadManager* DownloadManager::_instance = nullptr;
/* Public interface: */
DownloadManager::DownloadManager()
: accessManager(this), serverUrl(ApplicationSettings::getInstance()->downloadServerUrl())
{
}
DownloadManager::~DownloadManager()
{
shutdown();
_instance = nullptr;
}
void DownloadManager::shutdown()
{
qDebug() << "DownloadManager: shutting down," << activeJobs.size() << "active jobs";
abortDownloads();
}
// It is not recommended to create a singleton of Qml Singleton registered
// object but we could not found a better way to let us access DownloadManager
// on the C++ side. All our test shows that it works.
// Using the singleton after the QmlEngine has been destroyed is forbidden!
DownloadManager* DownloadManager::getInstance()
{
if (_instance == nullptr)
_instance = new DownloadManager;
return _instance;
}
QObject *DownloadManager::downloadManagerProvider(QQmlEngine *engine,
QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
return getInstance();
}
bool DownloadManager::downloadIsRunning() const
{
return !activeJobs.empty();
}
void DownloadManager::abortDownloads()
{
if (downloadIsRunning()) {
QMutexLocker locker(&jobsMutex);
QMutableListIterator<DownloadJob*> iter(activeJobs);
while (iter.hasNext()) {
DownloadJob *job = iter.next();
if (job->reply != nullptr) {
disconnect(job->reply, SIGNAL(finished()), this, SLOT(downloadFinished()));
disconnect(job->reply, SIGNAL(error(QNetworkReply::NetworkError)),
this, SLOT(handleError(QNetworkReply::NetworkError)));
if (job->reply->isRunning()) {
qDebug() << "Aborting download job:" << job->url;
job->reply->abort();
job->file.close();
job->file.remove();
}
job->reply->deleteLater();
}
iter.remove();
}
locker.unlock();
emit error(QNetworkReply::OperationCanceledError, QObject::tr("Download cancelled by user"));
}
}
QString DownloadManager::getVoicesResourceForLocale(const QString& locale) const
{
return QString("data2/voices-" COMPRESSED_AUDIO "/voices-%1.rcc")
.arg(ApplicationInfo::getInstance()->getVoicesLocale(locale));
}
+QString DownloadManager::getBackgroundMusicResources() const
+{
+ return QString("data2/backgroundMusic/backgroundMusic-" COMPRESSED_AUDIO ".rcc");
+}
+
inline QString DownloadManager::getAbsoluteResourcePath(const QString& path) const
{
for (const QString &base : getSystemResourcePaths()) {
if (QFile::exists(base + '/' + path))
return QString(base + '/' + path);
}
return QString();
}
// @FIXME should support a variable subpath length like data2/full.rcc"
inline QString DownloadManager::getRelativeResourcePath(const QString& path) const
{
QStringList parts = path.split('/', QString::SkipEmptyParts);
if (parts.size() < 3)
return QString();
return QString(parts[parts.size()-3] + '/' + parts[parts.size()-2]
+ '/' + parts[parts.size()-1]);
}
bool DownloadManager::haveLocalResource(const QString& path) const
{
return (!getAbsoluteResourcePath(path).isEmpty());
}
bool DownloadManager::updateResource(const QString& path)
{
if (checkDownloadRestriction())
return downloadResource(path); // check for updates and register
QString absPath = getAbsoluteResourcePath(path);
// automatic download prohibited -> register if available
if (!absPath.isEmpty())
return registerResourceAbsolute(absPath);
qDebug() << "No such local resource and download prohibited: "
<< path;
return false;
}
bool DownloadManager::downloadResource(const QString& path)
{
DownloadJob* job = nullptr;
{
QMutexLocker locker(&jobsMutex);
QUrl url(serverUrl.toString() + '/' + path);
if (getJobByUrl_locked(url) != nullptr) {
qDebug() << "Download of" << url << "is already running, skipping second attempt.";
return false;
}
job = new DownloadJob(url);
activeJobs.append(job);
}
qDebug() << "Downloading resource file" << path;
if (!download(job)) {
QMutexLocker locker(&jobsMutex);
activeJobs.removeOne(job);
return false;
}
return true;
}
/* Private: */
inline QString DownloadManager::tempFilenameForFilename(const QString &filename) const
{
return QString(filename).append("_");
}
inline QString DownloadManager::filenameForTempFilename(const QString &tempFilename) const
{
if (tempFilename.endsWith(QLatin1String("_")))
return tempFilename.left(tempFilename.length() - 1);
return tempFilename;
}
bool DownloadManager::download(DownloadJob* job)
{
QNetworkRequest request;
// First download Contents file for verification if not yet done:
if (!job->contents.contains(job->url.fileName())) {
int len = job->url.fileName().length();
QUrl contentsUrl = QUrl(job->url.toString().remove(job->url.toString().length() - len, len)
+ contentsFilename);
if (!job->knownContentsUrls.contains(contentsUrl)) {
// Note: need to track already tried Contents files or we can end
// up in an infinite loop if corresponding Contents file does not
// exist upstream
job->knownContentsUrls.append(contentsUrl);
//qDebug() << "Postponing rcc download, first fetching Contents" << contentsUrl;
job->queue.prepend(job->url);
job->url = contentsUrl;
}
}
QFileInfo fi(getFilenameForUrl(job->url));
// make sure target path exists:
QDir dir;
if (!dir.exists(fi.path()) && !dir.mkpath(fi.path())) {
qDebug() << "Could not create resource path " << fi.path();
emit error(QNetworkReply::ProtocolUnknownError, QObject::tr("Could not create resource path"));
return false;
}
job->file.setFileName(tempFilenameForFilename(fi.filePath()));
if (!job->file.open(QIODevice::WriteOnly)) {
emit error(QNetworkReply::ProtocolUnknownError,
QObject::tr("Could not open target file %1").arg(job->file.fileName()));
return false;
}
// start download:
request.setUrl(job->url);
//qDebug() << "Now downloading" << job->url << "to" << fi.filePath() << "...";
QNetworkReply *reply = accessManager.get(request);
job->reply = reply;
connect(reply, SIGNAL(finished()), this, SLOT(downloadFinished()));
connect(reply, &QNetworkReply::readyRead, this, &DownloadManager::downloadReadyRead);
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)),
this, SLOT(handleError(QNetworkReply::NetworkError)));
if (job->url.fileName() != contentsFilename) {
connect(reply, &QNetworkReply::downloadProgress,
this, &DownloadManager::downloadProgress);
emit downloadStarted(job->url.toString().remove(0, serverUrl.toString().length()));
}
return true;
}
inline DownloadManager::DownloadJob* DownloadManager::getJobByUrl_locked(const QUrl& url) const
{
for (auto activeJob : activeJobs)
if (activeJob->url == url || activeJob->queue.indexOf(url) != -1)
return activeJob;
return nullptr;
}
inline DownloadManager::DownloadJob* DownloadManager::getJobByReply(QNetworkReply *r)
{
QMutexLocker locker(&jobsMutex);
for (auto activeJob : activeJobs)
if (activeJob->reply == r)
return activeJob;
return nullptr; // should never happen!
}
void DownloadManager::downloadReadyRead()
{
QNetworkReply *reply = dynamic_cast<QNetworkReply*>(sender());
DownloadJob *job = getJobByReply(reply);
job->file.write(reply->readAll());
}
inline QString DownloadManager::getFilenameForUrl(const QUrl& url) const
{
QString relPart = url.toString().remove(0, serverUrl.toString().length());
return QString(getSystemDownloadPath() + relPart);
}
inline QUrl DownloadManager::getUrlForFilename(const QString& filename) const
{
return QUrl(serverUrl.toString() + '/' + getRelativeResourcePath(filename));
}
inline QString DownloadManager::getSystemDownloadPath() const
{
return ApplicationSettings::getInstance()->cachePath();
}
inline QStringList DownloadManager::getSystemResourcePaths() const
{
QStringList results({
QCoreApplication::applicationDirPath() + '/' + QString(GCOMPRIS_DATA_FOLDER) + "/rcc/",
getSystemDownloadPath(),
QStandardPaths::writableLocation(QStandardPaths::CacheLocation),
#if defined(Q_OS_ANDROID)
"assets:",
#endif
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
'/' + GCOMPRIS_APPLICATION_NAME
});
#if QT_VERSION >= 0x050400
// Append standard application directories (like /usr/share/KDE/gcompris-qt)
results += QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
#endif
return results;
}
bool DownloadManager::checkDownloadRestriction() const
{
#if 0
// note: Something like the following can be used once bearer mgmt
// has been implemented for android (cf. Qt bug #30394)
QNetworkConfiguration::BearerType conn = networkConfiguration.bearerType();
qDebug() << "Bearer type: "<< conn << ": "<< networkConfiguration.bearerTypeName();
if (!ApplicationSettings::getInstance()->isMobileNetworkDownloadsEnabled() &&
conn != QNetworkConfiguration::BearerEthernet &&
conn != QNetworkConfiguration::QNetworkConfiguration::BearerWLAN)
return false;
return true;
#endif
return ApplicationSettings::getInstance()->isAutomaticDownloadsEnabled() &&
ApplicationInfo::getInstance()->isDownloadAllowed();
}
void DownloadManager::handleError(QNetworkReply::NetworkError code)
{
Q_UNUSED(code);
QNetworkReply *reply = dynamic_cast<QNetworkReply*>(sender());
qDebug() << reply->errorString() << " " << reply->error();
emit error(reply->error(), reply->errorString());
}
bool DownloadManager::parseContents(DownloadJob *job)
{
if (job->file.isOpen())
job->file.close();
if (!job->file.open(QIODevice::ReadOnly | QIODevice::Text)) {
qWarning() << "Could not open file " << job->file.fileName();
return false;
}
/*
* We expect the line-syntax, that md5sum and colleagues creates:
* <MD5SUM> <FILENAME>
* 53f0a3eb206b3028500ca039615c5f84 voices-en.rcc
*/
QTextStream in(&job->file);
while (!in.atEnd()) {
QString line = in.readLine();
QStringList parts = line.split(' ', QString::SkipEmptyParts);
if (parts.size() != 2) {
qWarning() << "Invalid format of Contents file!";
return false;
}
job->contents[parts[1]] = parts[0];
//qDebug() << "Contents: " << parts[1] << " -> " << parts[0];
}
job->file.close();
return true;
}
bool DownloadManager::checksumMatches(DownloadJob *job, const QString& filename) const
{
Q_ASSERT(!job->contents.empty());
if (!QFile::exists(filename))
return false;
QString basename = QFileInfo(filename).fileName();
if (!job->contents.contains(basename))
return false;
QFile file(filename);
file.open(QIODevice::ReadOnly);
QCryptographicHash fileHasher(hashMethod);
if (!fileHasher.addData(&file)) {
qWarning() << "Could not read file for hashing: " << filename;
return false;
}
file.close();
QByteArray fileHash = fileHasher.result().toHex();
//qDebug() << "Checking file-hash ~ contents-hash: " << fileHash << " ~ " << job->contents[basename];
return (fileHash == job->contents[basename]);
}
void DownloadManager::unregisterResource_locked(const QString& filename)
{
if (!QResource::unregisterResource(filename))
qDebug() << "Error unregistering resource file" << filename;
else {
qDebug() << "Successfully unregistered resource file" << filename;
registeredResources.removeOne(filename);
}
}
inline bool DownloadManager::isRegistered(const QString& filename) const
{
return (registeredResources.indexOf(filename) != -1);
}
/*
* Registers an rcc file given by absolute path
*/
bool DownloadManager::registerResourceAbsolute(const QString& filename)
{
QMutexLocker locker(&rcMutex);
if (isRegistered(filename))
unregisterResource_locked(filename);
if (!QResource::registerResource(filename)) {
qDebug() << "Error registering resource file" << filename;
return false;
}
qDebug() << "Successfully registered resource"
<< filename;
registeredResources.append(filename);
locker.unlock(); /* note: we unlock before emitting to prevent
* potential deadlocks */
emit resourceRegistered(getRelativeResourcePath(filename));
QString v = getVoicesResourceForLocale(
- ApplicationSettings::getInstance()->locale());
+ ApplicationSettings::getInstance()->locale());
+ QString musicPath = getBackgroundMusicResources();
+
if (v == getRelativeResourcePath(filename))
emit voicesRegistered();
+ else if(musicPath == getRelativeResourcePath(filename))
+ emit backgroundMusicRegistered();
return true;
}
/*
* Registers an rcc file given by a relative resource path
*/
bool DownloadManager::registerResource(const QString& filename)
{
return registerResourceAbsolute(getAbsoluteResourcePath(filename));
}
bool DownloadManager::isDataRegistered(const QString& data) const
{
QString res = QString(":/gcompris/data/%1").arg(data);
-
return !QDir(res).entryList().empty();
}
bool DownloadManager::areVoicesRegistered() const
{
QString resource = QString("voices-" COMPRESSED_AUDIO "/%1").
arg(ApplicationInfo::getInstance()->getVoicesLocale(ApplicationSettings::getInstance()->locale()));
-
return isDataRegistered(resource);
}
void DownloadManager::downloadFinished()
{
QNetworkReply* reply = dynamic_cast<QNetworkReply*>(sender());
DownloadFinishedCode code = Success;
DownloadJob *job = getJobByReply(reply);
if (job->file.isOpen()) {
job->file.flush(); // note: important, or checksums might be wrong!
job->file.close();
}
if (reply->error() != 0 && job->file.exists()) {
job->file.remove();
}
else {
// active temp file
QString tFilename = filenameForTempFilename(job->file.fileName());
if (QFile::exists(tFilename)) {
QFile::remove(tFilename);
}
if (!job->file.rename(tFilename)) {
qWarning() << "Could not rename temporary file to" << tFilename;
}
}
QString targetFilename = getFilenameForUrl(job->url);
if (job->url.fileName() == contentsFilename) {
// Contents
if (reply->error() != 0) {
qWarning() << "Error downloading Contents from" << job->url
<< ":" << reply->error() << ":" << reply->errorString();
// note: errorHandler() emit's error!
goto outError;
}
//qDebug() << "Download of Contents finished successfully: " << job->url;
if (!parseContents(job)) {
qWarning() << "Invalid format of Contents file" << job->url;
emit error(QNetworkReply::UnknownContentError, QObject::tr("Invalid format of Contents file"));
goto outError;
}
} else {
QUrl redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
// RCC file
if (reply->error() != 0) {
qWarning() << "Error downloading RCC file from " << job->url
<< ":" << reply->error() << ":" << reply->errorString();
// note: errorHandler() emit's error!
code = Error;
// register already existing files (if not yet done):
if (QFile::exists(targetFilename) && !isRegistered(targetFilename))
registerResourceAbsolute(targetFilename);
}
// In case the file does not exist on the server, it is redirected to
// an error page and this error page is downloaded but on our case
// this is an error as we don't have the expected rcc.
else if (!redirect.isEmpty()) {
qWarning() << QString("The url %1 does not exist.").arg(job->url.toString());
emit error(QNetworkReply::UnknownContentError,
QObject::tr("The url %1 does not exist.")
.arg(job->url.toString()));
code = Error;
if (QFile::exists(targetFilename)) {
QFile::remove(targetFilename);
}
}
else {
qDebug() << "Download of RCC file finished successfully: " << job->url;
if (!checksumMatches(job, targetFilename)) {
qWarning() << "Checksum of downloaded file does not match: "
<< targetFilename;
emit error(QNetworkReply::UnknownContentError,
QObject::tr("Checksum of downloaded file does not match: %1")
.arg(targetFilename));
code = Error;
} else
registerResourceAbsolute(targetFilename);
}
}
// try next:
while (!job->queue.isEmpty()) {
job->url = job->queue.takeFirst();
QString relPath = getRelativeResourcePath(getFilenameForUrl(job->url));
// check in each resource-path for an up2date rcc file:
for (const QString &base : getSystemResourcePaths()) {
QString filename = base + '/' + relPath;
if (QFile::exists(filename)
&& checksumMatches(job, filename))
{
// file is up2date, register! necessary:
qDebug() << "Local resource is up-to-date:"
<< QFileInfo(filename).fileName();
if (!isRegistered(filename)) // no update and already registered -> noop
registerResourceAbsolute(filename);
code = NoChange;
break;
}
}
if (code != NoChange) // nothing is up2date locally -> download it
if (download(job))
goto outNext;
}
// none left, DownloadJob finished
if (job->file.isOpen())
job->file.close();
{ // note: must remove before signalling downloadFinished(), otherwise race condition for the Qt.quit() case
QMutexLocker locker(&jobsMutex);
activeJobs.removeOne(job);
}
emit downloadFinished(code);
reply->deleteLater();
delete job;
return;
outError:
if (job->url.fileName() == contentsFilename) {
// if we could not download the contents file register local existing
// files for outstanding jobs:
QUrl nUrl;
while (!job->queue.isEmpty()) {
nUrl = job->queue.takeFirst();
QString relPath = getRelativeResourcePath(getFilenameForUrl(nUrl));
for (const QString &base: getSystemResourcePaths()) {
QString filename = base + '/' + relPath;
if (QFile::exists(filename))
registerResourceAbsolute(filename);
}
}
}
if (job->file.isOpen())
job->file.close();
{
QMutexLocker locker(&jobsMutex);
activeJobs.removeOne(job);
}
reply->deleteLater();
delete job;
return;
outNext:
// next sub-job started
reply->deleteLater();
return;
}
#if 0
// vvv might be helpful later with other use-cases:
void DownloadManager::registerLocalResources()
{
QStringList filenames = getLocalResources();
if (filenames.empty()) {
qDebug() << "No local resources found";
return;
}
QList<QString>::const_iterator iter;
for (iter = filenames.constBegin(); iter != filenames.constEnd(); iter++)
registerResource(*iter);
}
bool DownloadManager::checkForUpdates()
{
QStringList filenames = getLocalResources();
if (filenames.empty()) {
qDebug() << "No local resources found";
return true;
}
if (!checkDownloadRestriction()) {
qDebug() << "Can't download with current network connection (" <<
networkConfiguration.bearerTypeName() << ")!";
return false;
}
QList<QString>::const_iterator iter;
DownloadJob *job = new DownloadJob();
for (iter = filenames.constBegin(); iter != filenames.constEnd(); iter++) {
QUrl url = getUrlForFilename(*iter);
qDebug() << "Scheduling resource for update: " << url;
job->queue.append(url);
}
job->url = job->queue.takeFirst();
{
QMutexLocker locker(&jobsMutex);
activeJobs.append(job);
}
if (!download(job)) {
QMutexLocker locker(&jobsMutex);
activeJobs.removeOne(job);
return false;
}
return true;
}
QStringList DownloadManager::getLocalResources()
{
QStringList result;
for (const QString &path : getSystemResourcePaths()) {
QDir dir(path);
if (!dir.exists(path) && !dir.mkpath(path)) {
qWarning() << "Could not create resource path " << path;
continue;
}
QDirIterator it(dir, QDirIterator::Subdirectories);
while (it.hasNext()) {
QString filename = it.next();
QFileInfo fi = it.fileInfo();
if (fi.isFile() &&
(filename.endsWith(QLatin1String(".rcc"))))
result.append(filename);
}
}
return result;
}
#endif
diff --git a/src/core/DownloadManager.h b/src/core/DownloadManager.h
index ae03264b5..bf207cf60 100644
--- a/src/core/DownloadManager.h
+++ b/src/core/DownloadManager.h
@@ -1,382 +1,392 @@
/* GCompris - DownloadManager.h
*
* Copyright (C) 2014 Holger Kaelberer <holger.k@elberer.de>
*
* Authors:
* Holger Kaelberer <holger.k@elberer.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#ifndef DOWNLOADMANAGER_H
#define DOWNLOADMANAGER_H
#include <QCryptographicHash>
#include <QFile>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QMutex>
#include <QNetworkConfiguration>
#include <QString>
#include <QUrl>
#include <QVariant>
#include <QQmlEngine>
#include <QJSEngine>
/**
* @class DownloadManager
* @short A singleton class responsible for downloading, updating and
* maintaining remote resources.
* @ingroup infrastructure
*
* DownloadManager is responsible for downloading, updating and registering
* additional resources (in Qt's binary .rcc format) used by GCompris.
* It downloads from a upstream URL (ApplicationSettings.downloadServerUrl) to the
* default local writable location. Downloads are based on common relative
* resource paths, such that a URL of the form
*
* <tt>http://\<server-base\>/\<path/to/my/resource.rcc\></tt>
*
* will be downloaded to a local path
*
* <tt>/\<ApplicationSettings::getInstance()->cachePath()\>/\<path/to/my/resource.rcc\></tt>
*
* and registered with a resource root path
*
* <tt>qrc:/\<path/to/my\>/</tt>
*
* Internally resources are uniquely identified by their <em>relative resource
* path</em>
*
* <tt>\<path/to/my/resource.rcc\></tt>
* (e.g. <tt>data2/voices-ogg/voices-en.rcc></tt>)
*
* Downloading and verification of local files is controlled by MD5
* checksums that are expected to be stored in @c Contents files in each
* upstream directory according to the syntax produced by the @c md5sum
* tool. The checksums are used for checking whether a local rcc file is
* up-to-date (to avoid unnecesary rcc downloads) and to verify that the
* transfer was complete. Only valid rcc files (with correct checksums)
* are registered.
*
* A resource file must reference the "/gcompris/data" prefix with
* \<qresource prefix="/gcompris/data"\>. All data are loaded and referenced
* from this prefix. It is possible to check if a data is registered with
* isDataRegistered.
*
* @sa DownloadDialog, ApplicationSettings.downloadServerUrl,
* ApplicationSettings.isAutomaticDownloadsEnabled,
* ApplicationSettings.cachePath
*/
class DownloadManager : public QObject
{
Q_OBJECT
private:
DownloadManager(); // prohibit external creation, we are a singleton!
static DownloadManager* _instance; // singleton instance
/** Container for a full download job */
typedef struct DownloadJob
{
QUrl url; ///< url of the currently running sub-job
QFile file; ///< target file for the currently running sub-job
QNetworkReply *reply; ///< reply object for the currently running sub-job
QList<QUrl> queue; ///< q of remaining sub jobs (QList for convenience)
QMap<QString,QString> contents; ///< checksum map for download verification
QList<QUrl> knownContentsUrls; ///< store already tried upstream Contents files (for infinite loop protection)
DownloadJob(const QUrl &u = QUrl()) : url(u), file(), reply(0),
queue(QList<QUrl>()) {}
} DownloadJob;
QList<DownloadJob*> activeJobs; ///< track active jobs to allow for parallel downloads
QMutex jobsMutex; ///< not sure if we need to expect concurrent access, better lockit!
static const QString contentsFilename;
static const QCryptographicHash::Algorithm hashMethod = QCryptographicHash::Md5;
QList<QString> registeredResources;
QMutex rcMutex; ///< not sure if we need to expect concurrent access, better lockit!
QNetworkAccessManager accessManager;
QUrl serverUrl;
/**
* Get the platform-specific path storing downloaded resources.
*
* Uses QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
* which returns
* - on desktop linux $HOME/.cache/KDE/gcompris-qt/
- * - on other platforms check <http://doc.qt.io/qt-5/qstandardpaths.html>
+ * - on other platforms check <https://doc.qt.io/qt-5/qstandardpaths.html>
*
* @return An absolute path.
*/
QString getSystemDownloadPath() const;
/**
* Get all paths that are used for storing resources.
*
* @returns A list of absolute paths used for storing local resources.
* The caller should keep the returned list order when looking for
* resources, for now the lists contains:
* 1. data folder in the application path
* 2. getSystemDownloadPath()
* 3. QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)/gcompris-qt
* which is
* - $HOME/.local/share/gcompris-qt (on linux desktop)
* - /storage/sdcard0/GCompris (on android)
* 4. [QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation)]/gcompris-qt
* which is on GNU/Linux
* - $HOME/.local/share/KDE/gcompris-qt
* - $HOME/.local/share/gcompris-qt
* - $HOME/.local/share/applications/gcompris-qt
* - /usr/local/share/KDE/gcompris-qt
* - /usr/share/KDE/gcompris-qt
*/
QStringList getSystemResourcePaths() const;
QString getResourceRootForFilename(const QString& filename) const;
QString getFilenameForUrl(const QUrl& url) const;
QUrl getUrlForFilename(const QString& filename) const;
/**
* Transforms the passed relative path to an absolute resource path of an
* existing .rcc file, honouring the order of the systemResourcePaths
*
* @returns The absolute path of the .rcc file if it exists, QString()
* otherwise
*/
QString getAbsoluteResourcePath(const QString& path) const;
/**
* Transforms the passed absolute path to a relative resource path if
* possible.
*
* @returns The relative path if it could be generated, QString() otherwise.
*/
QString getRelativeResourcePath(const QString& path) const;
QString tempFilenameForFilename(const QString &filename) const;
QString filenameForTempFilename(const QString &tempFilename) const;
bool checkDownloadRestriction() const;
DownloadJob* getJobByReply(QNetworkReply *r);
DownloadJob* getJobByUrl_locked(const QUrl& url) const;
/** Start a new download specified by the passed DownloadJob */
bool download(DownloadJob* job);
/** Parses upstream Contents file and build checksum map. */
bool parseContents(DownloadJob *job);
/** Compares the checksum of the file in filename with the contents map in
* the passed DownloadJob */
bool checksumMatches(DownloadJob *job, const QString& filename) const;
bool registerResourceAbsolute(const QString& filename);
/** Unregisters the passed resource
*
* Caller must lock rcMutex.
*/
void unregisterResource_locked(const QString& filename);
bool isRegistered(const QString& filename) const;
#if 0
QStringList getLocalResources();
#endif
private slots:
/** Handle a finished download.
*
* Called whenever a single download (sub-job) has finished. Responsible
* for iterating over possibly remaining sub-jobs of our DownloadJob.
*/
void downloadFinished();
void downloadReadyRead();
void handleError(QNetworkReply::NetworkError code);
public:
// public interface:
/**
* Possible return codes of a finished download
*/
enum DownloadFinishedCode {
Success = 0, /**< Download finished successfully */
Error = 1, /**< Download error */
NoChange = 2 /**< Local files are up-to-date, no download was needed */
};
virtual ~DownloadManager();
/**
* Registers DownloadManager singleton in the QML engine.
*/
static QObject *downloadManagerProvider(QQmlEngine *engine,
QJSEngine *scriptEngine);
static DownloadManager* getInstance();
/**
* Generates a relative voices resources file-path for a given @p locale.
*
* @param locale Locale name string of the form \<language\>_\<country\>.
*
* @returns A relative voices resource path.
*/
Q_INVOKABLE QString getVoicesResourceForLocale(const QString& locale) const;
+ // @returns A relative background music resource path.
+ Q_INVOKABLE QString getBackgroundMusicResources() const;
/**
* Checks whether the given relative resource @p path exists locally.
*
* @param path A relative resource path.
*/
Q_INVOKABLE bool haveLocalResource(const QString& path) const;
/**
* Whether any download is currently running.
*/
Q_INVOKABLE bool downloadIsRunning() const;
/**
* Whether the passed relative @p data is registered.
*
* For example, if you have a resource file which loads files under the
* 'words' path like 'words/one.png'. You can call this method with 'words/one.png'
* or with 'words'.
*
* @param data Relative resource path (file or directory).
*
* @sa areVoicesRegistered
*/
Q_INVOKABLE bool isDataRegistered(const QString& data) const;
/**
* Whether voices for the currently active locale are registered.
*
* @sa isDataRegistered
*/
Q_INVOKABLE bool areVoicesRegistered() const;
/**
* Registers a rcc resource file given by a relative resource path
*
* @param filename Relative resource path.
*/
Q_INVOKABLE bool registerResource(const QString& filename);
public slots:
/**
* Updates a resource @p path from the upstream server unless prohibited
* by the settings and registers it if possible.
*
* If not prohibited by the setting 'isAutomaticDownloadsEnabled' checks
* for an available upstream resource specified by @p path.
* If the corresponding local resource does not exist or is out of date,
* the resource is downloaded and registered.
*
* If automatic downloads/updates are prohibited and a local copy of the
* specified resource exists, it is registered.
*
* @param path A relative resource path.
*
* @returns success
*/
Q_INVOKABLE bool updateResource(const QString& path);
/**
* Download a resource specified by the relative resource @p path and
* register it if possible.
*
* If a corresponding local resource exists, an update will only be
* downloaded if it is not up-to-date according to checksum comparison.
* Whenever at the end we have a valid .rcc file it will be registered.
*
* @param path A relative resource path.
*
* @returns success
*/
Q_INVOKABLE bool downloadResource(const QString& path);
/**
* Shutdown DownloadManager instance.
*
* Aborts all currently running downloads.
*/
Q_INVOKABLE void shutdown();
/**
* Abort all currently running downloads.
*/
Q_INVOKABLE void abortDownloads();
#if 0
Q_INVOKABLE bool checkForUpdates(); // might be helpful later with other use-cases!
Q_INVOKABLE void registerLocalResources();
#endif
signals:
/** Emitted when a download error occurs.
*
* @param code enum NetworkError code.
* @param msg Error string.
*/
void error(int code, const QString& msg);
/** Emitted when a download has started.
*
* @param resource Relative resource path of the started download.
*/
void downloadStarted(const QString& resource);
/** Emitted during a running download.
*
* All values refer to the currently active sub-job.
*
* @param bytesReceived Downloaded bytes.
* @param bytesTotal Total bytes to download.
*/
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
/** Emitted when a download has finished.
*
* Also emitted in error cases.
*
* @param code DownloadFinishedCode. FIXME: when using DownloadFinishedCode
* instead of int the code will not be passed to the QML layer,
* use QENUMS?
*/
void downloadFinished(int code);
/** Emitted when a resource has been registered.
*
* @param resource Relative resource path of the registered resource.
*
* @sa voicesRegistered
*/
void resourceRegistered(const QString& resource);
/** Emitted when voices resources for current locale have been registered.
*
* Convenience signal and special case of resourceRegistered.
*
* @sa resourceRegistered
*/
void voicesRegistered();
+
+ /** Emitted when background music has been registered.
+ *
+ * Convenience signal and special case of resourceRegistered.
+ *
+ * @sa resourceRegistered
+ */
+ void backgroundMusicRegistered();
};
#endif /* DOWNLOADMANAGER_H */
diff --git a/src/core/GCAudio.qml b/src/core/GCAudio.qml
index 0d1d0028e..abc7a24d6 100644
--- a/src/core/GCAudio.qml
+++ b/src/core/GCAudio.qml
@@ -1,224 +1,273 @@
/* GCompris - GCAudio.qml
*
* Copyright (C) 2014 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtMultimedia 5.0
import GCompris 1.0
/**
* A QML component for audio playback.
* @ingroup components
*
* Wrapper component around QtQuick's Audio element, handling all audio
* playback in GCompris uniformly.
*
* It maintains a queue of audio-sources (@ref files) that are played back
* sequentially, to which the user can enqueue files that should be scheduled
* for playback.
*
* To make sure an audio voice will be localized, replace the locale part
* of the file by '$LOCALE'.
*
* To makes sure that all audio sources are normalized with respect to
* ApplicationInfo.CompressedAudio replace the 'ogg' part of the file by
* '$CA'.
*
* @inherit QtQuick.Item
*/
Item {
id: gcaudio
/**
* type:bool
* Whether audio should be muted.
*/
property bool muted
/**
* type:url
* URL to the audio source to be played back.
*/
property alias source: audio.source
+ /**
+ * type: positive real number less than 1
+ * Determines intensity of the audio.
+ */
+ property alias volume: audio.volume
+
+ /**
+ * type:bool
+ * Whether the audio element contains audio.
+ */
+ property bool hasAudio: audio.hasAudio
+
/**
* type:string
* Detailed error message in case of playback errors.
*/
property alias errorString: audio.errorString
+
+ /**
+ * type:bool
+ * check if the player is for background music
+ */
+ property bool isBackgroundMusic: false
+
+ /**
+ * type:array
+ * background music metadata
+ */
+ property var metaDataMusic: ["", "", "", ""]
+
+ /**
+ * Trigger this signal externally to play the next audio in the "files". This, in turn, stops the currently playing audio and check the necessary
+ * conditions (see onStopped signal in "audio" element) and decides what needs to be done for the next audio.
+ */
+ signal nextAudio()
+ onNextAudio: stop()
/**
* type:var
* Current playback state.
*
* Possible values taken from Audio.status
*/
property var playbackState: (audio.error == Audio.NoError) ?
audio.playbackState : Audio.StoppedState;
/**
* type:list
* Playback queue.
*/
property var files: []
/**
* Emitted in case of error.
*/
signal error
/**
* Emitted when playback of all scheduled audio sources has finished.
*/
signal done
- /**
- * When mute is changed we set the volume to 0 to mute a potential playing
- * sound.
- */
- onMutedChanged: muted ? audio.volume = 0 : audio.volume = 1
+ //Pauses the currently playing audio
+ function pause() {
+ if(playbackState === Audio.PlayingState)
+ audio.pause()
+ }
+
+ //Resumes the current audio if it had been paused
+ function resume() {
+ if(playbackState === Audio.PausedState || playbackState === Audio.StoppedState)
+ audio.play()
+ }
/**
* Plays back the audio resource @p file.
*
* @param type:string file [optional] URL to an audio source.
* @returns @c true if playback has been started, @c false if file does not
* exist or audio is muted
*/
function play(file) {
if(!fileId.exists(file) || muted)
return false
if(file) {
// Setting the source to "" on Linux fix a case where the sound is no more played if you play twice the same sound in a row
source = ""
source = file
}
if(!muted) {
audio.play()
}
return true
}
/**
* Stops audio playback.
*/
function stop() {
if(audio.playbackState != Audio.StoppedState)
audio.stop()
}
/**
* Schedules a @p file for audio playback.
*
* If there is no playback currently running, the new source will be
* played back immediately. Otherwise it is appended to the file queue of
* sources.
*
* @param type:string file File to the audio file to be played back.
* @returns @c true upon success, or @c false if @p file does not exist or
* audio is muted
*/
function append(file) {
if(!fileId.exists(file) || muted)
return false
if(audio.playbackState !== Audio.PlayingState
|| audio.status === Audio.EndOfMedia
|| audio.status === Audio.NoMedia
|| audio.status === Audio.InvalidMedia) {
// Setting the source to "" on Linux fix a case where the sound is no more played
source = ""
source = file
files.push(file)
+ silenceTimer.interval = 1
silenceTimer.start()
} else {
files.push(file)
}
return true
}
/**
* Adds a pause of the given duration in ms before playing of the next file.
*
* @param type:int duration_ms Pause in milliseconds.
*/
function silence(duration_ms) {
silenceTimer.interval = duration_ms
}
/**
* Flushes the list of scheduled files.
* @sa files
*/
function clearQueue() {
while(files.length > 0) {
files.pop();
}
}
/// @cond INTERNAL_DOCS
function _playNextFile() {
+ if(files.length == 0) {
+ gcaudio.done()
+ return
+ }
+
var nextFile = files.shift()
- if(!nextFile || 0 === nextFile.length) {
- audio.source = ""
+ if(nextFile === '') {
+ source = ""
gcaudio.done()
} else {
- audio.source = ""
- audio.source = nextFile
+ source = ""
+ source = nextFile
if(!muted)
audio.play()
}
}
Audio {
id: audio
+ muted: gcaudio.muted
onError: {
// This file cannot be played, remove it from the source asap
source = ""
if(files.length)
silenceTimer.start()
else
gcaudio.error()
}
onStopped: {
if(files.length)
silenceTimer.start()
else
gcaudio.done()
}
+ metaData.onMetaDataChanged: {
+ if(isBackgroundMusic) {
+ metaDataMusic = [metaData.title, metaData.contributingArtist, metaData.year, metaData.copyright]
+ }
+ }
}
Timer {
id: silenceTimer
repeat: false
onTriggered: {
interval = 0
_playNextFile()
}
}
File {
id: fileId
}
/// @endcond
}
diff --git a/src/core/GCButtonStyle.qml b/src/core/GCButtonStyle.qml
index 09d813b94..73873eb74 100644
--- a/src/core/GCButtonStyle.qml
+++ b/src/core/GCButtonStyle.qml
@@ -1,159 +1,175 @@
/* GCompris - GCButtonStyle.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.5
import QtQuick.Controls.Styles 1.4
import GCompris 1.0
/**
* Provides styling for GCompris' Buttons.
* @ingroup components
*
* @inherit QtQuick.Controls.Styles.ButtonStyle
*/
ButtonStyle {
id: buttonStyle
/**
* type:real
* Fixed font size of the label in pt.
*
* Set to a value > 0 for enforcing a fixed font.pointSize for the label,
* that won't be updated with ApplicationSettings.baseFontSize.
* @sa ApplicationSettings.baseFontSize, GCText.fixFontSize
*/
property real fixedFontSize: -1
/**
* type:string
* theme of the button. For now, three themes are accepted: "light" and "dark" and "highContrast"
*
* Default is dark.
- */
+ */
property string theme: "dark"
+
+ /**
+ * type:bool
+ * if there is an icon on the right, we need to add a rightMargin for the text label
+ *
+ * Default is false.
+ */
+ property bool haveIconRight: false
/**
* type:var
* existing themes for the button.
* A theme is composed of:
* the colors of the button when selected: selectedColorGradient0 and selectedColorGradient1.
* the colors of the button when not selected: backgroundColorGradient0 and backgroundColorGradient1.
* the button's border color
* the text color
- */
+ */
+
property var themes: {
"dark": {
backgroundColorGradient0: "#23373737",
selectedColorGradient0: "#C03ACAFF",
backgroundColorGradient1: "#13373737",
selectedColorGradient1: "#803ACAFF",
borderColor: "#FF373737",
textColor: "#FF373737"
},
"light": {
backgroundColorGradient0: "#42FFFFFF",
selectedColorGradient0: "#C03ACAFF",
backgroundColorGradient1: "#23FFFFFF",
selectedColorGradient1: "#803ACAFF",
borderColor: "white",
textColor: "white"
},
"highContrast": {
backgroundColorGradient0: "#EEFFFFFF",
selectedColorGradient0: "#C03ACAFF",
backgroundColorGradient1: "#AAFFFFFF",
selectedColorGradient1: "#803ACAFF",
borderColor: "white",
- textColor: "#373737"
-
+ textColor: "#FF373737"
+ },
+ "categories": {
+ backgroundColorGradient0: "#80F6FBFC",
+ selectedColorGradient0: "#FFF6FBFC",
+ backgroundColorGradient1: "#80F6FBFC",
+ selectedColorGradient1: "#FFF6FBFC",
+ borderColor: "#FF87A6DD",
+ textColor: "#FF373737"
},
"settingsButton": {
backgroundColorGradient0: "#bdbed0",
selectedColorGradient0: "#e6e6e6",
backgroundColorGradient1: "#bdbed0",
selectedColorGradient1: "#e6e6e6",
borderColor: selected ? "#ffffffff" : "#00ffffff",
textColor: "black"
},
"noStyle": {
backgroundColorGradient0: "#00FFFFFF",
selectedColorGradient0: "#00FFFFFF",
backgroundColorGradient1: "#00FFFFFF",
selectedColorGradient1: "#00FFFFFF",
borderColor: "#00FFFFFF",
textColor: "#00000000"
}
}
property bool selected: false
property string textSize: "regular"
property var textSizes: {
"regular": {
fontSize: 14,
fontBold: false
},
"subtitle": {
fontSize: 16,
fontBold: true
},
"title": {
fontSize: 24,
fontBold: true
}
}
background: Rectangle {
- border.width: theme === "settingsButton" ? 3 * ApplicationInfo.ratio : control.activeFocus ? 3 * ApplicationInfo.ratio : 1 * ApplicationInfo.ratio
+ border.width: theme === "settingsButton" ? 3 * ApplicationInfo.ratio : control.activeFocus ? 3 * ApplicationInfo.ratio : 1 * ApplicationInfo.ratio
border.color: themes[theme].borderColor
radius: 10 * ApplicationInfo.ratio
gradient: Gradient {
GradientStop { position: 0 ; color: (control.pressed || buttonStyle.selected) ? themes[theme].selectedColorGradient0 : themes[theme].backgroundColorGradient0 }
GradientStop { position: 1 ; color: (control.pressed || buttonStyle.selected) ? themes[theme].selectedColorGradient1 : themes[theme].backgroundColorGradient1 }
}
}
label: Item {
id: labelItem
anchors.fill: parent
implicitWidth: labelText.implicitWidth
implicitHeight: labelText.implicitHeight
GCText {
id: labelText
color: themes[theme].textColor
text: control.text
fontSize: textSizes[textSize].fontSize
font.bold: textSizes[textSize].fontBold
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
fontSizeMode: Text.Fit
Component.onCompleted: {
if (fixedFontSize > 0) {
labelText.fixFontSize = true;
labelText.fontSize = fixedFontSize;
}
}
}
}
}
diff --git a/src/core/GCComboBox.qml b/src/core/GCComboBox.qml
index 3d3523035..381e2ba34 100644
--- a/src/core/GCComboBox.qml
+++ b/src/core/GCComboBox.qml
@@ -1,322 +1,322 @@
/* GCompris - GCComboBox.qml
*
* Copyright (C) 2015 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.5
import GCompris 1.0
/**
* A QML component unifying comboboxes in GCompris.
* @ingroup components
*
* GCComboBox contains a combobox and a label.
* When the combobox isn't active, it is displayed as a button containing the current value
* and the combobox label (its description).
* Once the button is clicked, the list of all available choices is displayed.
* Also, above the list is the combobox label.
*
* Navigation can be done with keys and mouse/gestures.
* As Qt comboboxes, you can either have a js Array or a Qml model as model.
* GCComboBox should now be used wherever you'd use a QtQuick combobox. It has
* been decided to implement comboboxes ourselves in GCompris because of
* some integration problems on some OSes (native dialogs unavailable).
*/
Item {
id: gccombobox
focus: true
width: parent.width
height: flow.height
/**
* type:Item
* Where the list containing all choices will be displayed.
* Should be the dialogActivityConfig item if used on config.
*/
property Item background
/**
* type:int
* Current index of the combobox.
*/
property int currentIndex: -1
/**
* type:string
* Current text displayed in the combobox when inactive.
*/
property string currentText
/**
* type:alias
* Model for the list (user has to specify one).
*/
property alias model: gridview.model
/**
* type:string
* Text besides the combobox, used to describe what the combobox is for.
*/
property string label
/**
* type:bool
* Internal value.
* If model is an js Array, we access data using modelData and [] else qml Model, we need to use model and get().
*/
readonly property bool isModelArray: model.constructor === Array
// start and stop trigs the animation
signal start
signal stop
// emitted at stop animation end
signal close
onCurrentIndexChanged: {
currentText = isModelArray ? model[currentIndex].text : (model && model.get(currentIndex) ? model.get(currentIndex).text : "")
}
/**
* type:Flow
- * Combobox display when inactive: the button with current choice and its label besides.
+ * Combobox display when inactive: the label and the button with current choice.
*/
Flow {
id: flow
width: parent.width
spacing: 5 * ApplicationInfo.ratio
Rectangle {
id: button
visible: true
// Add radius to add some space between text and borders
implicitWidth: Math.max(200, currentTextBox.width+radius)
implicitHeight: 50 * ApplicationInfo.ratio
border.width: 2
border.color: "#373737"
radius: 10
gradient: Gradient {
GradientStop { position: 0 ; color: mouseArea.pressed ? "#C03ACAFF" : "#23373737" }
GradientStop { position: 1 ; color: mouseArea.pressed ? "#803ACAFF" : "#13373737" }
}
// Current value of combobox
GCText {
id: currentTextBox
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
text: currentText
fontSize: mediumSize
color: "#373737"
}
MouseArea {
id: mouseArea
anchors.fill: parent
onReleased: {
popup.visible = true
}
}
}
Item {
width: labelText.width
height: button.height
GCText {
id: labelText
text: label
anchors.verticalCenter: parent.verticalCenter
fontSize: mediumSize
wrapMode: Text.WordWrap
}
}
}
/**
* type:Item
* Combobox display when active: header with the description and the gridview containing all the available choices.
*/
Item {
id: popup
visible: false
width: if(parent) parent.width
height: if(parent) parent.height
parent: background
z: 100
focus: visible
// Forward event to activity if key pressed is not one of the handled key
// (ctrl+F should still resize the window for example)
Keys.onPressed: {
if(event.key !== Qt.Key_Back) {
background.currentActivity.Keys.onPressed(event)
}
}
Keys.onReleased: {
if(event.key === Qt.Key_Back) {
// Keep the old value
discardChange();
hidePopUpAndRestoreFocus();
event.accepted = true
}
}
Keys.onRightPressed: gridview.moveCurrentIndexRight();
Keys.onLeftPressed: gridview.moveCurrentIndexLeft();
Keys.onDownPressed: gridview.moveCurrentIndexDown();
Keys.onUpPressed: gridview.moveCurrentIndexUp();
Keys.onEscapePressed: {
// Keep the old value
discardChange();
hidePopUpAndRestoreFocus();
}
Keys.onEnterPressed: {
acceptChange();
hidePopUpAndRestoreFocus();
}
Keys.onReturnPressed: {
acceptChange();
hidePopUpAndRestoreFocus();
}
Keys.onSpacePressed: {
acceptChange();
hidePopUpAndRestoreFocus();
}
// Don't accept the list value, restore previous value
function discardChange() {
if(isModelArray) {
for(var i = 0 ; i < model.count ; ++ i) {
if(model[currentIndex].text === currentText) {
currentIndex = i;
break;
}
}
}
else {
for(var i = 0 ; i < model.length ; ++ i) {
if(model.get(currentIndex).text === currentText) {
currentIndex = i;
break;
}
}
}
gridview.currentIndex = currentIndex;
}
// Accept the change. Updates the currentIndex and text of the button
function acceptChange() {
currentIndex = gridview.currentIndex;
currentText = isModelArray ? model[currentIndex].text : (model && model.get(currentIndex) ? model.get(currentIndex).text : "")
}
function hidePopUpAndRestoreFocus() {
popup.visible = false;
// Restore focus on previous activity for keyboard input
background.forceActiveFocus();
}
Rectangle {
id: listBackground
anchors.fill: parent
radius: 10
color: "grey"
Rectangle {
id : headerDescription
z: 10
width: gridview.width
height: gridview.elementHeight
GCText {
text: label
fontSize: mediumSize
wrapMode: Text.WordWrap
anchors.horizontalCenter: parent.horizontalCenter
}
GCButtonCancel {
id: discardIcon
anchors.right: headerDescription.right
anchors.top: headerDescription.top
MouseArea {
anchors.fill: parent
onClicked: {
popup.acceptChange();
popup.hidePopUpAndRestoreFocus();
}
}
}
}
GridView {
id: gridview
z: 4
readonly property int elementHeight: 40 * ApplicationInfo.ratio
// each element has a 300 width size minimum. If the screen is larger than it,
// we do a grid with cases with 300px for width at minimum.
// If you have a better idea/formula to have a different column number, don't hesitate, change it :).
readonly property int numberOfColumns: Math.max(1, Math.floor(width / (300 * ApplicationInfo.ratio)))
contentHeight: isModelArray ? elementHeight*model.count/numberOfColumns : elementHeight*model.length/numberOfColumns
width: listBackground.width
height: listBackground.height-headerDescription.height
currentIndex: gccombobox.currentIndex
flickableDirection: Flickable.VerticalFlick
clip: true
anchors.top: headerDescription.bottom
cellWidth: width / numberOfColumns
cellHeight: elementHeight
delegate: Component {
Rectangle {
width: gridview.cellWidth
height: gridview.elementHeight
color: GridView.isCurrentItem ? "darkcyan" : "beige"
border.width: GridView.isCurrentItem ? 3 : 2
radius: 5
Image {
id: isSelectedIcon
visible: parent.GridView.isCurrentItem
source: "qrc:/gcompris/src/core/resource/apply.svg"
anchors.left: parent.left
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 10
sourceSize.width: (gridview.elementHeight * 0.8)
}
GCText {
id: textValue
text: isModelArray ? modelData.text : model.text
anchors.centerIn: parent
}
MouseArea {
anchors.fill: parent
onClicked: {
currentIndex = index
popup.acceptChange();
popup.hidePopUpAndRestoreFocus();
}
}
}
}
}
}
}
}
diff --git a/src/core/GCSfx.qml b/src/core/GCSfx.qml
index 9f2aa2c33..29ba3da39 100644
--- a/src/core/GCSfx.qml
+++ b/src/core/GCSfx.qml
@@ -1,95 +1,95 @@
/* GCompris - GCSfx.qml
*
* Copyright (C) 2018 Timothée Giet <animtim@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com> (GCAudio base, 2014)
* Timothée Giet <animtim@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtMultimedia 5.0
import GCompris 1.0
/**
* A QML component for sfx playback.
* @ingroup components
*
* Wrapper component around QtQuick's SoundEffect element, handling all sfx
* playback in GCompris uniformly.
*
*
* @inherit QtQuick.Item
*/
Item {
id: gcsfx
/**
* type:bool
* Whether sfx should be muted.
*/
- property bool muted
+ property alias muted: sfx.muted
+
+ /**
+ * type:real
+ * Volume of the fx player.
+ */
+ property alias volume: sfx.volume
/**
* type:url
* URL to the sfx source to be played back.
*/
property alias source: sfx.source
/**
* type:string
* Status of the fx player.
*/
property alias status: sfx.status
-
- /**
- * When mute is changed we set the volume to 0 to mute a potential playing
- * sound.
- */
- onMutedChanged: muted ? sfx.volume = 0 : sfx.volume = 1
/**
* Plays back the sfx resource @p file.
*
* @param type:string file [optional] URL to an sfx source.
* @returns @c true if playback has been started, @c false if file does not
* exist or sfx is muted
*/
function play(file) {
if(file) {
source = file
}
if(!muted) {
sfx.play()
}
}
/**
* Stops sfx playback.
*/
function stop() {
if(sfx.playing)
sfx.stop()
}
/// @cond INTERNAL_DOCS
SoundEffect {
id: sfx
}
/// @endcond
}
diff --git a/src/core/LanguageList.qml b/src/core/LanguageList.qml
index 8139643a1..372fede7d 100644
--- a/src/core/LanguageList.qml
+++ b/src/core/LanguageList.qml
@@ -1,87 +1,88 @@
/* GCompris - LanguageList.qml
*
* Copyright (C) 2014 Johnny Jazeix <jazeix@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
/**
* Container object with a list of all available translations.
* @ingroup infrastructure
*
* Put here the locales for which we have a good enough translation.
*/
QtObject {
/**
* type:list
* List of language objects.
*
* A language object consists of the properties @c text (language string in
* the locales' language) and @c locale (locale string of the form
* aa_AA.UTF-8).
*
* The special purpose locale 'system' is used to refer to the system's
* standard locale.
*/
property var languages: [
{ "text": qsTr("Your system default"), "locale": "system" },
{ "text": "UK English", "locale": "en_GB.UTF-8" },
{ "text": "American English", "locale": "en_US.UTF-8" },
//{ "text": "български", "locale": "bg_BG.UTF-8" },
{ "text": "Brezhoneg", "locale": "br_FR.UTF-8" },
{"text": "Беларуская", "locale": "be_BY.UTF-8" },
{ "text": "Català", "locale": "ca_ES.UTF-8" },
//{ "text": "Česká", "locale": "cs_CZ.UTF-8" },
//{ "text": "Dansk", "locale": "da_DK.UTF-8" },
{ "text": "Deutsch", "locale": "de_DE.UTF-8" },
{ "text": "Ελληνικά", "locale": "el_GR.UTF-8" },
{ "text": "Español", "locale": "es_ES.UTF-8" },
{ "text": "Eesti", "locale": "et_EE.UTF-8" },
{ "text": "Euskara", "locale": "eu_ES.UTF-8" },
{ "text": "Suomi", "locale": "fi_FI.UTF-8" },
{ "text": "Français", "locale": "fr_FR.UTF-8" },
{ "text": "Gaeilge", "locale": "ga_IE.UTF-8" },
{ "text": "Gàidhlig", "locale": "gd_GB.UTF-8" },
{ "text": "Galego", "locale": "gl_ES.UTF-8" },
{ "text": "हिन्दी", "locale": "hi_IN.UTF-8" },
{ "text": "Magyar", "locale": "hu_HU.UTF-8" },
{ "text": "Indonesia", "locale": "id_ID.UTF-8" },
{ "text": "Italiano", "locale": "it_IT.UTF-8" },
//{ "text": "Lietuvių", "locale": "lt_LT.UTF-8" },
//{ "text": "Latviešu", "locale": "lv_LV.UTF-8" },
+ { "text": "Македонски", "locale": "mk_MK.UTF-8" },
{ "text": "മലയാളം", "locale": "ml_IN.UTF-8" },
{ "text": "Nederlands", "locale": "nl_NL.UTF-8" },
{ "text": "Norsk (nynorsk)", "locale": "nn_NO.UTF-8" },
{ "text": "Polski", "locale": "pl_PL.UTF-8" },
{ "text": "Português", "locale": "pt_PT.UTF-8" },
{ "text": "Português do Brasil", "locale": "pt_BR.UTF-8" },
{ "text": "Română", "locale": "ro_RO.UTF-8" },
{ "text": "Русский", "locale": "ru_RU.UTF-8" },
{ "text": "Slovenský", "locale": "sk_SK.UTF-8" },
{ "text": "Slovenski", "locale": "sl_SI.UTF-8" },
//{ "text": "црногорски jeзик", "locale": "sr_ME.UTF-8" },
{ "text": "Svenska", "locale": "sv_FI.UTF-8" },
//{ "text": "தமிழ்", "locale": "ta_IN.UTF-8" },
//{ "text": "ไทย", "locale": "th_TH.UTF-8" },
{ "text": "Türk", "locale": "tr_TR.UTF-8" },
{ "text": "український", "locale": "uk_UA.UTF-8" },
{ "text": "中文(简体)", "locale": "zh_CN.UTF-8" },
{ "text": "繁體中文", "locale": "zh_TW.UTF-8" }
]
}
diff --git a/src/core/ParticleSystemStarLoader.qml b/src/core/ParticleSystemStarLoader.qml
index 26689d827..1b8f5f4ae 100644
--- a/src/core/ParticleSystemStarLoader.qml
+++ b/src/core/ParticleSystemStarLoader.qml
@@ -1,60 +1,60 @@
/* GCompris - ParticleSystemStarLoader.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import GCompris 1.0
/**
* A QML loader that wraps ParticleSystemStar.
* @ingroup components
*
* Wrapper loading/activating a @ref ParticleSystemStarLoader only if
* the Android systems supports fragment shaders according to
* ApplicationInfo.hasShader.
*
* @inherit QtQuick.Loader
* @sa ParticleSystemStar ApplicationInfo.hasShader
*/
Loader {
anchors.fill: parent
active: ApplicationInfo.hasShader
/**
* Emits count particles from the particle emitter immediately.
*
* Cf. Emitter.burst
*/
function burst(val) {
if(active) {
item.start()
item.emitter.burst(val)
stopParticleSystem.restart()
}
}
Timer {
id: stopParticleSystem
- interval: item.emitter.lifeSpan + item.emitter.lifeSpanVariation
+ interval: (item && item.emitter) ? item.emitter.lifeSpan + item.emitter.lifeSpanVariation : 0
repeat: false
onTriggered: item.stop()
}
onLoaded: item.clip = clip
source: "ParticleSystemStar.qml"
}
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 25bb584d5..8b3f4e52e 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1,291 +1,296 @@
/* GCompris - main.cpp
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include <QtDebug>
#include <QApplication>
#include <QQuickWindow>
#include <QQmlApplicationEngine>
#include <QStandardPaths>
#include <QObject>
#include <QTranslator>
#include <QCommandLineParser>
#include <QCursor>
#include <QPixmap>
#include <QSettings>
#include "GComprisPlugin.h"
#include "ApplicationInfo.h"
#include "ActivityInfoTree.h"
#include "DownloadManager.h"
bool loadAndroidTranslation(QTranslator &translator, const QString &locale)
{
QFile file("assets:/share/GCompris/gcompris_" + locale + ".qm");
file.open(QIODevice::ReadOnly);
QDataStream in(&file);
uchar *data = (uchar*)malloc(file.size());
if(!file.exists())
qDebug() << "file assets:/share/GCompris/gcompris_" << locale << ".qm does not exist";
in.readRawData((char*)data, file.size());
if(!translator.load(data, file.size())) {
qDebug() << "Unable to load translation for locale " <<
locale << ", use en_US by default";
free(data);
return false;
}
// Do not free data, it is still needed by translator
return true;
}
// Return the locale
QString loadTranslation(QSettings &config, QTranslator &translator)
{
QString locale;
// Get locale
locale = config.value("General/locale", GC_DEFAULT_LOCALE).toString();
if(locale == GC_DEFAULT_LOCALE)
locale = QString(QLocale::system().name() + ".UTF-8");
if(locale == "C.UTF-8" || locale == "en_US.UTF-8")
return "en_US";
// Load translation
// Remove .UTF8
locale.remove(".UTF-8");
#if defined(Q_OS_ANDROID)
if(!loadAndroidTranslation(translator, locale))
loadAndroidTranslation(translator, ApplicationInfo::localeShort(locale));
#else
#if (defined(Q_OS_LINUX) || defined(Q_OS_UNIX))
// only useful for translators: load from $application_dir/../share/... if exists as it is where kde scripts install translations
if(translator.load("gcompris_qt.qm", QString("%1/../share/locale/%2/LC_MESSAGES").arg(QCoreApplication::applicationDirPath(), locale))) {
qDebug() << "load translation for locale " << locale << " in " <<
QString("%1/../share/locale/%2/LC_MESSAGES").arg(QCoreApplication::applicationDirPath(), locale);
}
else if(translator.load("gcompris_qt.qm", QString("%1/../share/locale/%2/LC_MESSAGES").arg(QCoreApplication::applicationDirPath(), locale.split('_')[0]))) {
qDebug() << "load translation for locale " << locale << " in " <<
QString("%1/../share/locale/%2/LC_MESSAGES").arg(QCoreApplication::applicationDirPath(), locale.split('_')[0]);
}
else
#endif
if(!translator.load("gcompris_" + locale, QString("%1/%2/translations").arg(QCoreApplication::applicationDirPath(), GCOMPRIS_DATA_FOLDER))) {
qDebug() << "Unable to load translation for locale " <<
locale << ", use en_US by default";
}
#endif
return locale;
}
int main(int argc, char *argv[])
{
// Disable it because we already support HDPI display natively
qunsetenv("QT_DEVICE_PIXEL_RATIO");
QApplication app(argc, argv);
app.setOrganizationName("KDE");
app.setApplicationName(GCOMPRIS_APPLICATION_NAME);
app.setOrganizationDomain("kde.org");
app.setApplicationVersion(ApplicationInfo::GCVersion());
+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
+ // Set desktop file name, as the built-in (orgDomain + appName) is not
+ // the one we use (because appName is gcompris-qt, not gcompris)
+ QGuiApplication::setDesktopFileName("org.kde.gcompris");
+#endif
//add a variable to disable default fullscreen on Mac, see below..
#if defined(Q_OS_MAC)
// Sandboxing on MacOSX as documented in:
- // http://doc.qt.io/qt-5/osx-deployment.html
+ // https://doc.qt.io/qt-5/osx-deployment.html
QDir dir(QGuiApplication::applicationDirPath());
dir.cdUp();
dir.cd("Plugins");
QGuiApplication::setLibraryPaths(QStringList(dir.absolutePath()));
#endif
// Local scope for config
QSettings config(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) +
"/gcompris/" + GCOMPRIS_APPLICATION_NAME + ".conf",
QSettings::IniFormat);
// Load translations
QTranslator translator;
loadTranslation(config, translator);
// Apply translation
app.installTranslator(&translator);
QCommandLineParser parser;
parser.setApplicationDescription("GCompris is an educational software for children 2 to 10");
parser.addHelpOption();
parser.addVersionOption();
QCommandLineOption exportActivitiesAsSQL("export-activities-as-sql", "Export activities as SQL");
parser.addOption(exportActivitiesAsSQL);
QCommandLineOption clDefaultCursor(QStringList() << "c" << "cursor",
QObject::tr("Run GCompris with the default system cursor."));
parser.addOption(clDefaultCursor);
QCommandLineOption clNoCursor(QStringList() << "C" << "nocursor",
QObject::tr("Run GCompris without cursor (touch screen mode)."));
parser.addOption(clNoCursor);
QCommandLineOption clFullscreen(QStringList() << "f" << "fullscreen",
QObject::tr("Run GCompris in fullscreen mode."));
parser.addOption(clFullscreen);
QCommandLineOption clWindow(QStringList() << "w" << "window",
QObject::tr("Run GCompris in window mode."));
parser.addOption(clWindow);
QCommandLineOption clSound(QStringList() << "s" << "sound",
QObject::tr("Run GCompris with sound enabled."));
parser.addOption(clSound);
QCommandLineOption clMute(QStringList() << "m" << "mute",
QObject::tr("Run GCompris without sound."));
parser.addOption(clMute);
QCommandLineOption clWithoutKioskMode(QStringList() << "disable-kioskmode",
QObject::tr("Disable the kiosk mode (default)."));
parser.addOption(clWithoutKioskMode);
QCommandLineOption clWithKioskMode(QStringList() << "enable-kioskmode",
QObject::tr("Enable the kiosk mode."));
parser.addOption(clWithKioskMode);
QCommandLineOption clSoftwareRenderer(QStringList() << "software-renderer",
QObject::tr("Use software renderer instead of openGL (slower but should run with any graphical card, needs Qt 5.8 minimum)."));
parser.addOption(clSoftwareRenderer);
QCommandLineOption clOpenGLRenderer(QStringList() << "opengl-renderer",
QObject::tr("Use openGL renderer instead of software (faster but crash potentially depending on your graphical card)."));
parser.addOption(clOpenGLRenderer);
parser.process(app);
GComprisPlugin plugin;
plugin.registerTypes("GCompris");
ActivityInfoTree::registerResources();
// Tell media players to stop playing, it's GCompris time
ApplicationInfo::getInstance()->requestAudioFocus();
// Must be done after ApplicationSettings is constructed because we get an
// async callback from the payment system
ApplicationSettings::getInstance()->checkPayment();
// Disable default fullscreen launch on Mac as it's a bit broken, window is behind desktop bars
#if defined(Q_OS_MAC)
bool isFullscreen = false;
#else
// for other platforms, fullscreen is the default value
bool isFullscreen = true;
#endif
{
isFullscreen = config.value("General/fullscreen", isFullscreen).toBool();
// Set the cursor image
bool defaultCursor = config.value("General/defaultCursor", false).toBool();
if(!defaultCursor && !parser.isSet(clDefaultCursor))
QGuiApplication::setOverrideCursor(
QCursor(QPixmap(":/gcompris/src/core/resource/cursor.svg"),
0, 0));
// Hide the cursor
bool noCursor = config.value("General/noCursor", false).toBool();
if(noCursor || parser.isSet(clNoCursor))
QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
}
// Update execution counter
ApplicationSettings::getInstance()->setExeCount(ApplicationSettings::getInstance()->exeCount() + 1);
if(parser.isSet(clFullscreen)) {
isFullscreen = true;
}
if(parser.isSet(clWindow)) {
isFullscreen = false;
}
if(parser.isSet(clMute)) {
ApplicationSettings::getInstance()->setIsAudioEffectsEnabled(false);
ApplicationSettings::getInstance()->setIsAudioVoicesEnabled(false);
}
if(parser.isSet(clSound)) {
ApplicationSettings::getInstance()->setIsAudioEffectsEnabled(true);
ApplicationSettings::getInstance()->setIsAudioVoicesEnabled(true);
}
if(parser.isSet(clWithoutKioskMode)) {
ApplicationSettings::getInstance()->setKioskMode(false);
}
if(parser.isSet(clWithKioskMode)) {
ApplicationSettings::getInstance()->setKioskMode(true);
}
if(parser.isSet(clSoftwareRenderer)) {
ApplicationSettings::getInstance()->setRenderer(QStringLiteral("software"));
}
if(parser.isSet(clOpenGLRenderer)) {
ApplicationSettings::getInstance()->setRenderer(QStringLiteral("opengl"));
}
// Set the renderer used
const QString &renderer = ApplicationSettings::getInstance()->renderer();
ApplicationInfo::getInstance()->setUseOpenGL(renderer != QLatin1String("software"));
#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
if(renderer == QLatin1String("software"))
QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
else if(renderer == QLatin1String("opengl"))
QQuickWindow::setSceneGraphBackend(QSGRendererInterface::OpenGL);
#endif
QQmlApplicationEngine engine(QUrl("qrc:/gcompris/src/core/main.qml"));
QObject::connect(&engine, &QQmlApplicationEngine::quit, DownloadManager::getInstance(),
&DownloadManager::shutdown);
// add import path for shipped qml modules:
#ifdef SAILFISHOS
engine.addImportPath(QStringLiteral("%1/../share/%2/lib/qml")
.arg(QCoreApplication::applicationDirPath()).arg(GCOMPRIS_APPLICATION_NAME));
#else
engine.addImportPath(QStringLiteral("%1/../lib/qml")
.arg(QCoreApplication::applicationDirPath()));
#endif
ApplicationInfo::getInstance()->setBox2DInstalled(engine);
if(parser.isSet(exportActivitiesAsSQL)) {
ActivityInfoTree *menuTree(qobject_cast<ActivityInfoTree*>(ActivityInfoTree::menuTreeProvider(&engine, nullptr)));
menuTree->exportAsSQL();
exit(0);
}
QObject *topLevel = engine.rootObjects().value(0);
QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
if (window == nullptr) {
qWarning("Error: Your root item has to be a Window.");
return -1;
}
ApplicationInfo::setWindow(window);
window->setIcon(QIcon(QPixmap(QString::fromUtf8(":/gcompris/src/core/resource/gcompris-icon.png"))));
if(isFullscreen) {
window->showFullScreen();
}
else {
window->show();
}
return app.exec();
}
diff --git a/src/core/main.qml b/src/core/main.qml
index a550de7ab..fa423e14b 100644
--- a/src/core/main.qml
+++ b/src/core/main.qml
@@ -1,351 +1,448 @@
/* GCompris - main.qml
*
* Copyright (C) 2014 Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* Authors:
* Bruno Coudoin <bruno.coudoin@gcompris.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick 2.6
import QtQuick.Controls 1.5
import QtQuick.Window 2.2
import QtQml 2.2
import GCompris 1.0
import "qrc:/gcompris/src/core/core.js" as Core
/**
* GCompris' main QML file defining the top level window.
* @ingroup infrastructure
*
* Handles application start (Component.onCompleted) and shutdown (onClosing)
* on the QML layer.
*
* Contains the central GCAudio objects audio effects and audio voices.
*
* Contains the top level StackView presenting and animating GCompris'
* full screen views.
*
* @sa BarButton, BarEnumContent
* @inherit QtQuick.Window
*/
Window {
id: main
// Start in window mode at full screen size
width: ApplicationSettings.previousWidth
height: ApplicationSettings.previousHeight
minimumWidth: 400 * ApplicationInfo.ratio
minimumHeight: 400 * ApplicationInfo.ratio
title: "GCompris"
/// @cond INTERNAL_DOCS
property var applicationState: Qt.application.state
+ property var rccBackgroundMusic: ApplicationInfo.getBackgroundMusicFromRcc()
+ property var filteredBackgroundMusic: ApplicationSettings.filteredBackgroundMusic
+ property alias backgroundMusic: backgroundMusic
+
+ /**
+ * type: bool
+ * It tells whether a musical activity is running.
+ *
+ * It changes to true if the started activity is a musical activity and back to false when the activity is closed, allowing to play background music.
+ */
property bool isMusicalActivityRunning: false
+ /**
+ * When a musical activity is started, the backgroundMusic pauses.
+ *
+ * When returning back from the musical activity to menu, backgroundMusic resumes.
+ */
+ onIsMusicalActivityRunningChanged: {
+ if(isMusicalActivityRunning) {
+ backgroundMusic.pause()
+ }
+ else {
+ backgroundMusic.resume()
+ }
+ }
+
onApplicationStateChanged: {
if (ApplicationInfo.isMobile && applicationState != Qt.ApplicationActive) {
audioVoices.stop();
audioEffects.stop();
}
}
onClosing: Core.quit(main)
GCAudio {
id: audioVoices
muted: !ApplicationSettings.isAudioVoicesEnabled
Timer {
id: delayedWelcomeTimer
interval: 10000 /* Make sure, that playing welcome.ogg if delayed
* because of not yet registered voices, will only
* happen max 10sec after startup */
repeat: false
onTriggered: {
DownloadManager.voicesRegistered.disconnect(playWelcome);
}
function playWelcome() {
audioVoices.append(ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/misc/welcome.$CA"));
}
}
Component.onCompleted: {
- if(ApplicationSettings.isAudioEffectsEnabled)
- audioVoices.append(ApplicationInfo.getAudioFilePath("qrc:/gcompris/src/core/resource/intro.$CA"))
-
if (DownloadManager.areVoicesRegistered())
delayedWelcomeTimer.playWelcome();
else {
DownloadManager.voicesRegistered.connect(
delayedWelcomeTimer.playWelcome);
delayedWelcomeTimer.start();
}
}
}
GCSfx {
id: audioEffects
muted: !ApplicationSettings.isAudioEffectsEnabled && !main.isMusicalActivityRunning
+ volume: ApplicationSettings.audioEffectsVolume
+ }
+
+ GCAudio {
+ id: backgroundMusic
+ isBackgroundMusic: true
+ muted: !ApplicationSettings.isBackgroundMusicEnabled
+ volume: ApplicationSettings.backgroundMusicVolume
+
+ onMutedChanged: {
+ if(!hasAudio && !files.length) {
+ backgroundMusic.playBackgroundMusic()
+ }
+ }
+
+ onDone: backgroundMusic.playBackgroundMusic()
+
+ function playBackgroundMusic() {
+ rccBackgroundMusic = ApplicationInfo.getBackgroundMusicFromRcc()
+
+ for(var i = 0; i < filteredBackgroundMusic.length; i++) {
+ backgroundMusic.append(ApplicationInfo.getAudioFilePath("backgroundMusic/" + filteredBackgroundMusic[i]))
+ }
+ if(main.isMusicalActivityRunning)
+ backgroundMusic.pause()
+ }
+
+ Component.onCompleted: {
+ if(ApplicationSettings.isBackgroundMusicEnabled)
+ backgroundMusic.append(ApplicationInfo.getAudioFilePath("qrc:/gcompris/src/core/resource/intro.$CA"))
+ if(ApplicationSettings.isBackgroundMusicEnabled
+ && DownloadManager.haveLocalResource(DownloadManager.getBackgroundMusicResources())) {
+ backgroundMusic.playBackgroundMusic()
+ }
+ else {
+ DownloadManager.backgroundMusicRegistered.connect(backgroundMusic.playBackgroundMusic)
+ }
+ }
}
function playIntroVoice(name) {
name = name.split("/")[0]
audioVoices.play(ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/intro/" + name + ".$CA"))
}
function checkWordset() {
var wordset = ApplicationSettings.wordset
if(wordset == '')
// Maybe the wordset has been bundled or copied manually
// we have to register it if we find it.
wordset = 'data2/words/words.rcc'
// check for words.rcc:
if (DownloadManager.isDataRegistered("words")) {
// words.rcc is already registered -> nothing to do
} else if(DownloadManager.haveLocalResource(wordset)) {
// words.rcc is there -> register old file first
// then try to update in the background
if(DownloadManager.updateResource(wordset)) {
ApplicationSettings.wordset = wordset
}
} else if(ApplicationSettings.wordset) { // Only if wordset specified
// words.rcc has not been downloaded yet -> ask for download
Core.showMessageDialog(
main,
qsTr("The images for several activities are not yet installed. " +
"Do you want to download them now?"),
qsTr("Yes"),
function() {
if (DownloadManager.downloadResource(wordset))
var downloadDialog = Core.showDownloadDialog(pageView.currentItem, {});
},
qsTr("No"), null,
function() { pageView.currentItem.focus = true }
);
}
}
+
+ function checkBackgroundMusic() {
+ var music = DownloadManager.getBackgroundMusicResources()
+ if(rccBackgroundMusic == '') {
+ rccBackgroundMusic = ApplicationInfo.getBackgroundMusicFromRcc()
+ }
+ if(music == '') {
+ music = DownloadManager.getBackgroundMusicResources()
+ }
+ // We have local music but it is not yet registered
+ else if(!DownloadManager.isDataRegistered("backgroundMusic") && DownloadManager.haveLocalResource(music)) {
+ // We have music and automatic download is enabled. Download the music and register it
+ if(DownloadManager.updateResource(music) && DownloadManager.downloadIsRunning()) {
+ DownloadManager.registerResource(music)
+ rccBackgroundMusic = Core.shuffle(ApplicationInfo.getBackgroundMusicFromRcc())
+ }
+ else {
+ rccBackgroundMusic = ApplicationInfo.getBackgroundMusicFromRcc()
+ }
+ }
+ else if(!DownloadManager.haveLocalResource(music)) {
+ Core.showMessageDialog(
+ main,
+ qsTr("The background music is not yet downloaded. ")
+ + qsTr("Do you want to download it now?"),
+ qsTr("Yes"),
+ function() {
+ if(DownloadManager.downloadResource(DownloadManager.getBackgroundMusicResources())) {
+ var downloadDialog = Core.showDownloadDialog(pageView.currentItem, {});
+ }
+ },
+ qsTr("No"), null,
+ function() { pageView.currentItem.focus = true }
+ );
+ }
+ }
+
ChangeLog {
id: changelog
}
Component.onCompleted: {
console.log("enter main.qml (run #" + ApplicationSettings.exeCount
+ ", ratio=" + ApplicationInfo.ratio
+ ", fontRatio=" + ApplicationInfo.fontRatio
+ ", dpi=" + Math.round(Screen.pixelDensity*25.4)
+ ", userDataPath=" + ApplicationSettings.userDataPath
+ ")");
if (ApplicationSettings.exeCount === 1 &&
!ApplicationSettings.isKioskMode &&
ApplicationInfo.isDownloadAllowed) {
// first run
var dialog;
dialog = Core.showMessageDialog(
main,
qsTr("Welcome to GCompris!") + '\n'
+ qsTr("You are running GCompris for the first time.") + '\n'
+ qsTr("You should verify that your application settings especially your language is set correctly, and that all language specific sound files are installed. You can do this in the Preferences Dialog.")
+ "\n"
+ qsTr("Have Fun!")
+ "\n"
+ qsTr("Your current language is %1 (%2).")
.arg(Qt.locale(ApplicationInfo.getVoicesLocale(ApplicationSettings.locale)).nativeLanguageName)
.arg(ApplicationInfo.getVoicesLocale(ApplicationSettings.locale))
+ "\n"
+ qsTr("Do you want to download the corresponding sound files now?"),
qsTr("Yes"),
function() {
if (DownloadManager.downloadResource(
DownloadManager.getVoicesResourceForLocale(ApplicationSettings.locale)))
var downloadDialog = Core.showDownloadDialog(pageView.currentItem, {});
},
qsTr("No"), null,
function() {
pageView.currentItem.focus = true
checkWordset()
+ checkBackgroundMusic()
}
);
}
else {
// Register voices-resources for current locale, updates/downloads only if
// not prohibited by the settings
if (!DownloadManager.areVoicesRegistered()) {
DownloadManager.updateResource(
DownloadManager.getVoicesResourceForLocale(ApplicationSettings.locale));
}
-
checkWordset()
-
+ checkBackgroundMusic()
if(changelog.isNewerVersion(ApplicationSettings.lastGCVersionRan, ApplicationInfo.GCVersionCode)) {
// display log between ApplicationSettings.lastGCVersionRan and ApplicationInfo.GCVersionCode
Core.showMessageDialog(
main,
qsTr("GCompris has been updated! Here are the new changes:<br/>") + changelog.getLogBetween(ApplicationSettings.lastGCVersionRan, ApplicationInfo.GCVersionCode),
"", null,
"", null,
function() { pageView.currentItem.focus = true }
);
// Store new version
ApplicationSettings.lastGCVersionRan = ApplicationInfo.GCVersionCode;
}
}
}
Loading {
id: loading
}
StackView {
id: pageView
anchors.fill: parent
initialItem: {
"item": "qrc:/gcompris/src/activities/" + ActivityInfoTree.rootMenu.name,
"properties": {
'audioVoices': audioVoices,
'audioEffects': audioEffects,
- 'loading': loading
+ 'loading': loading,
+ 'backgroundMusic': backgroundMusic
}
}
focus: true
delegate: StackViewDelegate {
id: root
function getTransition(properties)
{
audioVoices.clearQueue()
audioVoices.stop()
if(!properties.exitItem.isDialog && // if coming from menu and
!properties.enterItem.isDialog) // going into an activity then
- playIntroVoice(properties.enterItem.activityInfo.name); // play intro
+ playIntroVoice(properties.enterItem.activityInfo.name); // play intro
// Don't restart an activity if you click on help
if (!properties.exitItem.isDialog || // if coming from menu or
properties.enterItem.alwaysStart) // start signal enforced (for special case like transition from config-dialog to editor)
properties.enterItem.start();
if(properties.name === "pushTransition") {
if(properties.enterItem.isDialog) {
return pushVTransition
} else {
if(properties.enterItem.isMusicalActivity)
main.isMusicalActivityRunning = true
return pushHTransition
}
} else {
if(properties.exitItem.isDialog) {
return popVTransition
} else {
main.isMusicalActivityRunning = false
return popHTransition
}
}
}
function transitionFinished(properties)
{
properties.exitItem.opacity = 1
if(!properties.enterItem.isDialog) {
properties.exitItem.stop()
}
}
property Component pushHTransition: StackViewTransition {
PropertyAnimation {
target: enterItem
property: "x"
from: target.width
to: 0
duration: 500
easing.type: Easing.OutSine
}
PropertyAnimation {
target: exitItem
property: "x"
from: 0
to: -target.width
duration: 500
easing.type: Easing.OutSine
}
}
property Component popHTransition: StackViewTransition {
PropertyAnimation {
target: enterItem
property: "x"
from: -target.width
to: 0
duration: 500
easing.type: Easing.OutSine
}
PropertyAnimation {
target: exitItem
property: "x"
from: 0
to: target.width
duration: 500
easing.type: Easing.OutSine
}
}
property Component pushVTransition: StackViewTransition {
PropertyAnimation {
target: enterItem
property: "y"
from: -target.height
to: 0
duration: 500
easing.type: Easing.OutSine
}
PropertyAnimation {
target: exitItem
property: "y"
from: 0
to: target.height
duration: 500
easing.type: Easing.OutSine
}
}
property Component popVTransition: StackViewTransition {
PropertyAnimation {
target: enterItem
property: "y"
from: target.height
to: 0
duration: 500
easing.type: Easing.OutSine
}
PropertyAnimation {
target: exitItem
property: "y"
from: 0
to: -target.height
duration: 500
easing.type: Easing.OutSine
}
}
property Component replaceTransition: pushHTransition
}
}
/// @endcond
}
diff --git a/src/core/synth/GSynth.cpp b/src/core/synth/GSynth.cpp
index 6c8b32c2c..e5fc79abb 100644
--- a/src/core/synth/GSynth.cpp
+++ b/src/core/synth/GSynth.cpp
@@ -1,97 +1,97 @@
/* GCompris - GSynth.cpp
*
* Copyright (C) 2018 Timothée Giet <animtim@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
* Timothée Giet <animtim@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include "GSynth.h"
#include "generator.h"
#include <QDebug>
GSynth *GSynth::m_instance = nullptr;
GSynth::GSynth(QObject *parent) : QObject(parent)
{
- bufferSize = 8192;
+ static const int bufferSize = 8192;
m_format.setSampleRate(22050);
m_format.setChannelCount(1);
m_format.setSampleSize(16);
m_format.setCodec("audio/pcm");
m_format.setByteOrder(QAudioFormat::LittleEndian);
m_format.setSampleType(QAudioFormat::SignedInt);
QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
if (!info.isFormatSupported(m_format)) {
qWarning() << "Default format not supported - trying to use nearest";
m_format = info.nearestFormat(m_format);
}
m_device = QAudioDeviceInfo::defaultOutputDevice();
m_buffer = QByteArray(bufferSize, 0);
m_audioOutput = new QAudioOutput(m_device, m_format, this);
m_audioOutput->setBufferSize(bufferSize);
m_generator = new Generator(m_format, this);
// todo Only start generator if musical activity, and stop it on exit (in main.qml, activity.isMusicalActivity)
m_generator->setPreset(PresetCustom);
m_generator->start();
m_audioOutput->start(m_generator);
m_audioOutput->setVolume(1);
}
GSynth::~GSynth() {
m_audioOutput->stop();
m_generator->stop();
delete m_audioOutput;
delete m_generator;
auto i = m_timers.constBegin();
while (i != m_timers.constEnd()) {
delete i.value();
++i;
}
}
void GSynth::generate(int note, int duration) {
//test part...
m_generator->noteOn(1, note, 255);
if(!m_timers.contains(note)) {
m_timers[note] = new QTimer();
connect(m_timers[note], &QTimer::timeout, this,
[this, note]() {
stopAudio(note);
});
}
m_timers[note]->start(duration);
}
void GSynth::stopAudio(int note) {
m_generator->noteOff(1, note);
}
QObject *GSynth::synthProvider(QQmlEngine *engine,
QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
GSynth* synth = getInstance();
return synth;
}
diff --git a/src/core/synth/GSynth.h b/src/core/synth/GSynth.h
index 962e975ed..09fce75ba 100644
--- a/src/core/synth/GSynth.h
+++ b/src/core/synth/GSynth.h
@@ -1,79 +1,77 @@
/* GCompris - GSynth.h
*
* Copyright (C) 2018 Timothée Giet <animtim@gmail.com>
*
* Authors:
* Johnny Jazeix <jazeix@gmail.com>
* Timothée Giet <animtim@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#ifndef GSYNTH_H
#define GSYNTH_H
#include <QAudioDeviceInfo>
#include <QAudioOutput>
#include <QTimer>
#include <QQmlEngine>
#include "preset.h"
class Generator;
class GSynth : public QObject
{
Q_OBJECT
public:
explicit GSynth(QObject *parent = 0);
virtual ~GSynth();
/**
* Generate a note and start the corresponding timer
* to stop it at "duration" ms.
*
* @param note note to play
* @param duration how much time the note needs to be played
*/
Q_INVOKABLE void generate(int note, int duration);
static GSynth *getInstance() {
if(!m_instance) {
m_instance = new GSynth();
}
return m_instance;
}
static QObject *synthProvider(QQmlEngine *engine,
QJSEngine *scriptEngine);
protected:
static GSynth *m_instance;
private slots:
void stopAudio(int note);
private:
- unsigned int bufferSize;
-
Generator *m_generator;
QAudioDeviceInfo m_device;
QAudioFormat m_format;
QByteArray m_buffer;
QAudioOutput *m_audioOutput;
QMap<int, QTimer *> m_timers;
Preset PresetCustom;
};
#endif // GSYNTH_H
diff --git a/src/core/synth/generator.cpp b/src/core/synth/generator.cpp
index 70132f527..f79ddd990 100644
--- a/src/core/synth/generator.cpp
+++ b/src/core/synth/generator.cpp
@@ -1,268 +1,269 @@
/* miniSynth - A Simple Software Synthesizer
Copyright (C) 2015 Ville Räisänen <vsr at vsr.name>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "generator.h"
#include <qendian.h>
Generator::Generator(const QAudioFormat &_format, QObject *parent) : QIODevice(parent), format(_format) {
linSyn = new LinearSynthesis(Waveform::MODE_SIN);
curtime = 0;
defaultEnv.attackTime = 100;
defaultEnv.decayTime = 400;
defaultEnv.releaseTime = 100;
defaultEnv.initialAmpl = 0;
defaultEnv.peakAmpl = 1;
defaultEnv.sustainAmpl = 0.8;
mod_waveform = new Waveform(Waveform::MODE_SIN);
synthData = new qreal[maxUsedBytes];
for (unsigned int indMaxRead = 0; indMaxRead < maxUsedBytes; indMaxRead++) {
synthData[indMaxRead] = 0;
}
}
Generator::~Generator() {
delete linSyn;
delete [] synthData;
delete mod_waveform;
}
void
Generator::start() {
open(QIODevice::ReadOnly);
}
void
Generator::stop() {
close();
}
void
Generator::addWave(unsigned char note, unsigned char vel) {
Wave wav;
wav.state = wav.STATE_ATTACK;
wav.note = note;
wav.vel = vel;
wav.state_age = 0;
wav.age = 0;
wav.env = defaultEnv;
m_lock.lock();
waveList.push_back(wav);
m_lock.unlock();
}
qint64
Generator::readData(char *data, qint64 len) {
// QAudioOutput tends to ask large packets of data, which can lead to a
// large delay between noteOn requests and the generation of audio. Thus,
// in order to provide more responsive interface, the packet size is
// limited to 2048 bytes ~ 1024 samples.
if (len > maxUsedBytes) len = maxUsedBytes;
generateData(len);
memcpy(data, m_buffer.constData(), len);
curtime += (qreal)len/(m_samplingRate*2);
return len;
}
// Not used.
qint64
Generator::writeData(const char *data, qint64 len) {
Q_UNUSED(data);
Q_UNUSED(len);
return 0;
}
// Doesn't seem to be called by QAudioOutput.
qint64
Generator::bytesAvailable() const {
return m_buffer.size() + QIODevice::bytesAvailable();
}
void
Generator::noteOn(unsigned char chan, unsigned char note, unsigned char vel) {
// Velocity of 255 is assumed since a "pleasant" relationship between the
// velocity in the MIDI event and the parameters of the corresponding Wave
// cannot be currently selected by the user.
if (vel > 0) vel = 255;
addWave(note, vel);
Q_UNUSED(chan);
}
void
Generator::noteOff(unsigned char chan, unsigned char note) {
QMutableListIterator<Wave> i(waveList);
while (i.hasNext()) {
Wave wav = i.next();
if (wav.note == note && wav.state != Wave::STATE_RELEASE) {
// To avoid discontinuity in the envelope, the initial value for
// the release part of the envelope should be equal to current
// value.
wav.env.sustainAmpl = wav.env.eval(wav.state_age, wav.state);
wav.state = Wave::STATE_RELEASE;
wav.state_age = 0;
}
i.setValue(wav);
}
Q_UNUSED(chan);
}
void
-Generator::setMode(int _mode) {
+Generator::setMode(unsigned int _mode) {
delete linSyn;
linSyn = new LinearSynthesis(_mode);
curtime = 0;
}
void
Generator::setTimbre(QVector<int> &amplitudes, QVector<int> &phases) {
linSyn->setTimbre(amplitudes, phases);
}
void
Generator::generateData(qint64 len) {
unsigned int numSamples = len/2;
m_buffer.resize(len);
// Raw synthesized data is assembled into synthData.
memset(synthData, 0, numSamples*sizeof(qreal));
// All samples for each active note in waveList are synthesized separately.
m_lock.lock();
QMutableListIterator<Wave> i(waveList);
while (i.hasNext()) {
Wave wav = i.next();
- qreal attackTime = 0.001*(qreal)wav.env.attackTime,
- releaseTime = 0.001*(qreal)wav.env.releaseTime;
+ qreal attackTime = 0.001*(qreal)wav.env.attackTime;
+ qreal releaseTime = 0.001*(qreal)wav.env.releaseTime;
qreal freq = 8.175 * 0.5 * qPow(2, ((qreal)wav.note)/12);
qreal ampl = 0.5*((qreal)wav.vel)/256;
- qreal stateAge = wav.state_age,
- wavAge = wav.age;
+ qreal stateAge = wav.state_age;
+ qreal wavAge = wav.age;
const qreal step = 1.f / m_samplingRate;
qreal samplePerStep = 0.f;
for (unsigned int sample = 0; sample < numSamples; sample++, samplePerStep += step) {
qreal t = curtime + samplePerStep;
qreal envt = stateAge + samplePerStep;
qreal modt = wavAge + samplePerStep;
// Handle timed change of state in the ADSR-envelopes ATTACK->DECAY
// and RELEASE->OFF.
switch(wav.state) {
case ADSREnvelope::STATE_ATTACK:
if (envt > attackTime) {
stateAge -= attackTime;
wav.state = ADSREnvelope::STATE_DECAY;
wav.state_age -= attackTime;
envt = stateAge + samplePerStep;
}
break;
case ADSREnvelope::STATE_RELEASE:
if (envt > releaseTime) {
stateAge = 0;
wav.state = ADSREnvelope::STATE_OFF;
}
break;
}
if (wav.state == ADSREnvelope::STATE_OFF) {
break;
} else {
- qreal freqmod = 0, amod = 0;
+ qreal freqmod = 0;
+ qreal amod = 0;
// Compute modulation waves.
if (mod.FM_freq > 0) {
qreal envVal = mod.useEnvelope ? wav.env.eval(envt, wav.state) : 1;
if (mod.propFreq) {
freqmod = mod.FM_ampl
* envVal* mod_waveform->eval(2*M_PI*mod.FM_freq*freq*modt);
} else {
freqmod = mod.FM_ampl
* mod_waveform->eval(2*M_PI*mod.FM_freq*modt);
}
}
if (mod.AM_freq > 0) {
amod = (1 - qExp(-modt/mod.AM_time))*mod.AM_ampl * mod_waveform->eval(2*M_PI*mod.AM_freq*t);
}
// Evaluate the output wave for the current note and add to the
// output obtained with other notes.
qreal envVal = wav.env.eval(envt, wav.state);
qreal newVal = envVal * (ampl + amod)
* 0.5 * linSyn->evalTimbre(2*M_PI*(freq+freqmod)*(modt+100));
synthData[sample] += newVal;
}
}
wav.age += (qreal)numSamples/m_samplingRate;
if (wav.state != ADSREnvelope::STATE_OFF) {
wav.state_age += (qreal)numSamples/m_samplingRate;
i.setValue(wav);
}
else {
i.remove();
}
}
m_lock.unlock();
// Convert data from qreal to qint16.
const int channelBytes = format.sampleSize() / 8;
unsigned char *ptr = reinterpret_cast<unsigned char *>(m_buffer.data());
for (unsigned int sample = 0; sample < numSamples; sample++) {
if (synthData[sample] > 1) synthData[sample] = 1;
if (synthData[sample] < -1) synthData[sample] = -1;
qint16 value = static_cast<qint16>(synthData[sample] * 32767);
qToLittleEndian<qint16>(value, ptr);
ptr += channelBytes;
}
}
void
Generator::setEnvelope(ADSREnvelope &env) {
defaultEnv = env;
}
void
Generator::setModulation(Modulation &modulation) {
if (modulation.mode != mod_waveform->mode) {
delete mod_waveform;
mod_waveform = new Waveform(modulation.mode);
}
mod = modulation;
}
void Generator::setPreset(Preset &preset) {
setModulation(preset.mod);
setMode(preset.waveformMode);
setTimbre(preset.timbreAmplitudes, preset.timbrePhases);
setEnvelope(preset.env);
}
diff --git a/src/core/synth/generator.h b/src/core/synth/generator.h
index 3f6bf21f6..7f7e1001d 100644
--- a/src/core/synth/generator.h
+++ b/src/core/synth/generator.h
@@ -1,103 +1,103 @@
/* miniSynth - A Simple Software Synthesizer
Copyright (C) 2015 Ville Räisänen <vsr at vsr.name>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef GENERATOR_H
#define GENERATOR_H
#include <QAudioDeviceInfo>
#include <QAudioOutput>
#include <QByteArray>
#include <QIODevice>
#include <QMutex>
#include <QList>
#include <QMutableListIterator>
#include "linearSynthesis.h"
#include "modulation.h"
#include "ADSRenvelope.h"
#include "preset.h"
// The state of each active note is described with an Wave object. Wave
// objects are assembled into the QList<Wave> waveList and removed once
// they reach the state STATE_OFF.
class Wave {
public:
enum {STATE_OFF, STATE_ATTACK, STATE_DECAY, STATE_RELEASE};
unsigned char note, vel, state;
qreal state_age, age;
ADSREnvelope env;
};
// The synthesizer is implemented as a QIODevice and is connected to
// a QAudioOutput in mainWindow.cpp. QAudioOutput reads data from the
// synthersizer using the function readData(data, size). readData
// returns maximum of 2048 samples generated with generateData(len).
class Generator : public QIODevice {
Q_OBJECT
public:
explicit Generator(const QAudioFormat &_format, QObject *parent = 0);
~Generator();
void start ();
void stop ();
void setState ();
void addWave (unsigned char note, unsigned char vel);
qint64 readData(char *data, qint64 len);
qint64 writeData(const char *data, qint64 len);
qint64 bytesAvailable() const;
void generateData(qint64 len);
public slots:
void noteOn (unsigned char chan, unsigned char note, unsigned char vel);
void noteOff (unsigned char chan, unsigned char note);
// Slots for manipulation of the current patch.
- void setMode (int _mode);
+ void setMode (unsigned int _mode);
void setTimbre (QVector<int> &amplitudes, QVector<int> &phases);
void setEnvelope (ADSREnvelope &env);
void setModulation(Modulation &modulation);
void setPreset (Preset &preset);
private:
QAudioFormat format;
QByteArray m_buffer;
// State of the synthesizer
qreal curtime;
QList<Wave> waveList;
// Parameters of the current patch
LinearSynthesis *linSyn;
ADSREnvelope defaultEnv;
Modulation mod;
Waveform *mod_waveform;
static const int m_samplingRate = 22050;
static const int maxUsedBytes = 2048;
qreal *synthData;
QMutex m_lock;
};
#endif // GENERATOR_H
diff --git a/src/core/synth/linearSynthesis.cpp b/src/core/synth/linearSynthesis.cpp
index c5796b5ab..9d458426c 100644
--- a/src/core/synth/linearSynthesis.cpp
+++ b/src/core/synth/linearSynthesis.cpp
@@ -1,68 +1,68 @@
/* miniSynth - A Simple Software Synthesizer
Copyright (C) 2015 Ville Räisänen <vsr at vsr.name>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "linearSynthesis.h"
#include <QDebug>
LinearSynthesis::LinearSynthesis(unsigned int mode, unsigned int size) :
Waveform(mode, size) {
numHarmonics = 16;
timbreAmplitudes = new int[numHarmonics];
timbrePhases = new int[numHarmonics];
timbreAmplitudes[0] = 100;
}
void
LinearSynthesis::setTimbre(QVector<int> &amplitudes, QVector<int> &phases) {
Q_ASSERT(amplitudes.size() == phases.size());
delete[] timbreAmplitudes;
delete[] timbrePhases;
numHarmonics = amplitudes.size();
timbreAmplitudes = new int[numHarmonics];
timbrePhases = new int[numHarmonics];
- for(int i = 0 ; i < numHarmonics ; ++ i) {
+ for(unsigned int i = 0 ; i < numHarmonics ; ++ i) {
timbreAmplitudes[i] = amplitudes[i];
timbrePhases[i] = phases[i];
}
}
LinearSynthesis::~LinearSynthesis() {
delete[] timbreAmplitudes;
delete[] timbrePhases;
}
qreal
LinearSynthesis::evalTimbre(qreal t) {
qreal val = 0;
for (unsigned int harm = 0; harm < numHarmonics; harm++) {
- int qa_int = timbreAmplitudes[harm],
- qp_int = timbrePhases[harm];
+ int qa_int = timbreAmplitudes[harm];
+ int qp_int = timbrePhases[harm];
if (qa_int > 0) {
- qreal qa = (qreal)qa_int/100,
- qp = (2*M_PI*(qreal)qp_int)/360;
+ qreal qa = (qreal)qa_int/100;
+ qreal qp = (2*M_PI*(qreal)qp_int)/360;
val += qa * eval(((qreal)harm + 1) * t - qp);
}
}
return val;
}
diff --git a/src/core/synth/waveform.cpp b/src/core/synth/waveform.cpp
index 993e69a55..4c91f0bc5 100644
--- a/src/core/synth/waveform.cpp
+++ b/src/core/synth/waveform.cpp
@@ -1,126 +1,127 @@
/* miniSynth - A Simple Software Synthesizer
Copyright (C) 2015 Ville Räisänen <vsr at vsr.name>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "waveform.h"
#include <QCoreApplication>
#include <QDebug>
Waveform::Waveform(unsigned int mode, unsigned int size) {
waveTable = new qreal[size];
tableSize = size;
this->mode = mode;
for (unsigned int sample = 0; sample < tableSize; sample++) {
qreal u = (2*M_PI * (qreal)sample) / ((qreal)tableSize);
switch(mode) {
case MODE_SIN:
waveTable[sample] = waveSin(u);
break;
case MODE_SAW:
waveTable[sample] = waveSaw(u);
break;
case MODE_SAW2:
waveTable[sample] = waveSaw2(u);
break;
case MODE_SQU:
waveTable[sample] = waveSqu(u);
break;
}
}
}
Waveform::~Waveform() {
delete [] waveTable;
waveTable = nullptr;
}
qreal
Waveform::waveSin(qreal t) {
return qSin(t);
}
qreal
Waveform::waveSaw(qreal t) {
qreal tmod = (qreal)(fmod((double)t, 2*M_PI) - M_PI);
return tmod / M_PI;
}
qreal
Waveform::waveSaw2(qreal t) {
qreal tmod = (qreal)(fmod((double)t, 2*M_PI) - M_PI);
return 1 - 2 * qAbs(tmod) / M_PI;
}
qreal
Waveform::waveSqu(qreal t) {
qreal tmod = (qreal)fmod((double)t, 2*M_PI);
if (tmod < M_PI) {
return 1;
}
return -1;
}
qreal
Waveform::eval(qreal t) {
qreal tmod = fmod((double)t, 2*M_PI);
if (tmod < 0) tmod += 2*M_PI;
// Position indexed by a continuous variable does not generally fall on
// integer-valued points. Here indF is the "continuous-valued position"
// of the argument and is somewhere between the integers qFloor(indF) and
// qCeil(indF). When indF is not an integer, we use linear interpolation
// to obtain the appropriate value.
qreal indF = ((qreal)tableSize) * tmod / (2*(qreal)M_PI);
if (indF == (qreal)tableSize) indF = 0;
Q_ASSERT(indF >= 0);
Q_ASSERT(indF < (qreal)tableSize);
unsigned int ind_min = (unsigned int) qFloor(indF);
unsigned int ind_max = (unsigned int) qCeil(indF);
Q_ASSERT(ind_min <= ind_max);
Q_ASSERT(ind_max <= tableSize);
Q_ASSERT(ind_min < tableSize);
qreal indmod = indF - (qreal)ind_min;
Q_ASSERT(indmod < 1 && indmod >= 0);
- qreal value_next, value_prev;
+ qreal value_next;
+ qreal value_prev;
if (ind_min == ind_max) {
return waveTable[ind_min];
}
if (ind_max == tableSize) {
value_prev = waveTable[ind_min];
value_next = waveTable[0];
return indmod * value_next + (1-indmod) * value_prev;
}
if (ind_min < ind_max) {
Q_ASSERT(ind_max < tableSize);
value_prev = waveTable[ind_min];
value_next = waveTable[ind_max];
return indmod * value_next + (1-indmod) * value_prev;
}
// This shouldn't be reached;
qCritical("Wave Table Interpolation Failed");
QCoreApplication::exit(-1);
return 0;
}
diff --git a/tests/core/ApplicationInfoTest.cpp b/tests/core/ApplicationInfoTest.cpp
index 327f836ab..903a8885f 100644
--- a/tests/core/ApplicationInfoTest.cpp
+++ b/tests/core/ApplicationInfoTest.cpp
@@ -1,178 +1,178 @@
/* GCompris - ApplicationInfoTest.cpp
*
* Copyright (C) 2018 Billy Laws <blaws05@gmail.com>
* GCompris (C) 2018 GCompris Developers <gcompris-devel@kde.org>
*
* Authors:
* Billy Laws <blaws05@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include <QObject>
#include <QtTest>
#include "src/core/ApplicationInfo.h"
class ApplicationInfoTest : public QObject
{
public:
Q_OBJECT
private slots:
void LocaleTest_data();
void LocaleTest();
void WindowTest_data();
void WindowTest();
void getVoicesLocaleTest_data();
void getVoicesLocaleTest();
void getAudioFilePathForLocaleTest_data();
void getAudioFilePathForLocaleTest();
};
void ApplicationInfoTest::LocaleTest_data()
{
QTest::addColumn<QString>("localeFull");
QTest::addColumn<QString>("localeShort");
QTest::addColumn<QString>("higherWord");
QTest::addColumn<QString>("lowerWord");
QTest::newRow("British English") << QStringLiteral("en_GB")
<< QStringLiteral("en")
<< QStringLiteral("apple")
<< QStringLiteral("banana");
}
void ApplicationInfoTest::LocaleTest()
{
ApplicationInfo appInfo;
ApplicationInfo::getInstance();
QFETCH(QString, localeFull);
QFETCH(QString, localeShort);
QFETCH(QString, higherWord);
QFETCH(QString, lowerWord);
QVERIFY(appInfo.localeShort(localeFull) == localeShort);
QVERIFY(appInfo.localeCompare(higherWord, lowerWord, localeFull) == -1);
QVERIFY(appInfo.localeCompare(lowerWord, higherWord, localeFull) == 1);
QVERIFY(appInfo.localeCompare(higherWord, higherWord, localeFull) == 0);
QVariantList sortList;
sortList.append(QVariant(higherWord));
sortList.append(QVariant(lowerWord));
sortList.append(QVariant(higherWord));
sortList.append(QVariant(lowerWord));
sortList = appInfo.localeSort(sortList, localeFull);
QVERIFY(sortList[0] == higherWord);
QVERIFY(sortList[1] == higherWord);
QVERIFY(sortList[2] == lowerWord);
QVERIFY(sortList[3] == lowerWord);
}
void ApplicationInfoTest::WindowTest_data()
{
QTest::addColumn<bool>("useOpenGL");
QTest::addColumn<int>("applicationWidth");
QTest::addColumn<bool>("portraitMode");
QTest::newRow("dummy1") << true
<< 1920
<< true;
}
void ApplicationInfoTest::WindowTest()
{
ApplicationInfo appInfo;
ApplicationInfo::getInstance();
QFETCH(bool, useOpenGL);
QFETCH(int, applicationWidth);
QFETCH(bool, portraitMode);
appInfo.setApplicationWidth(applicationWidth);
appInfo.setIsPortraitMode(portraitMode);
appInfo.setUseOpenGL(useOpenGL);
QVERIFY(appInfo.useOpenGL() == useOpenGL);
QVERIFY(appInfo.applicationWidth() == applicationWidth);
QVERIFY(appInfo.isPortraitMode() == portraitMode);
}
void ApplicationInfoTest::getVoicesLocaleTest_data()
{
QTest::addColumn<QString>("actual");
QTest::addColumn<QString>("expected");
QTest::newRow("default") << GC_DEFAULT_LOCALE
- << "en";
+ << "en_US";
QTest::newRow("en_US") << "en_US"
- << "en";
+ << "en_US";
QTest::newRow("pt_BR") << "pt_BR"
<< "pt_BR";
QTest::newRow("pt_PT") << "pt_PT"
<< "pt";
QTest::newRow("fr_FR") << "fr_FR"
<< "fr";
}
void ApplicationInfoTest::getVoicesLocaleTest()
{
// Set default locale to "C". ALlows to test GC_DEFAULT_LOCALE
QLocale defaultLocale = QLocale::system();
QLocale::setDefault(QLocale::c());
ApplicationInfo appInfo;
ApplicationInfo::getInstance();
QFETCH(QString, actual);
QFETCH(QString, expected);
QCOMPARE(appInfo.getVoicesLocale(actual), expected);
QLocale::setDefault(defaultLocale);
}
void ApplicationInfoTest::getAudioFilePathForLocaleTest_data()
{
QTest::addColumn<QString>("file");
QTest::addColumn<QString>("locale");
QTest::addColumn<QString>("expected");
QTest::newRow("absolutePath_en") << "/$LOCALE/$CA"
<< "en"
<< QString("/en/%1").arg(COMPRESSED_AUDIO);
QTest::newRow("absolutePath_pt_BR") << "qrc:/$LOCALE/test"
<< "pt_BR"
<< "qrc:/pt_BR/test";
QTest::newRow("absolute_fr") << ":/test/test2"
<< "unused"
<< ":/test/test2";
QTest::newRow("relative_fr") << "$LOCALE/$CA"
<< "fr"
<< QString("qrc:/gcompris/data/fr/%1").arg(COMPRESSED_AUDIO);
}
void ApplicationInfoTest::getAudioFilePathForLocaleTest()
{
ApplicationInfo appInfo;
ApplicationInfo::getInstance();
QFETCH(QString, file);
QFETCH(QString, locale);
QFETCH(QString, expected);
QCOMPARE(appInfo.getAudioFilePathForLocale(file, locale), expected);
}
QTEST_MAIN(ApplicationInfoTest)
#include "ApplicationInfoTest.moc"
diff --git a/tests/core/DownloadManagerTest.cpp b/tests/core/DownloadManagerTest.cpp
index d899243e2..4c4bf71c9 100644
--- a/tests/core/DownloadManagerTest.cpp
+++ b/tests/core/DownloadManagerTest.cpp
@@ -1,184 +1,184 @@
/* GCompris - DownloadManagerTest.cpp
*
* Copyright (C) 2018 Alex Kovrigin <a.kovrigin0@gmail.com>
* GCompris (C) 2018 GCompris Developers <gcompris-devel@kde.org>
*
* Authors:
* Alex Kovrigin <a.kovrigin0@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <https://www.gnu.org/licenses/>.
*/
#include <QObject>
#include <QtTest>
#include <QString>
#include "src/core/DownloadManager.h"
#include "src/core/ApplicationInfo.h"
#include "ApplicationSettingsMock.h"
/**
* @brief The DownloadManagerTest class Unit tests class for DownloadManager testing
* @sa DownloadManager
*/
class DownloadManagerTest : public QObject
{
Q_OBJECT
private slots:
/**
* @brief initTestCase Case for basic functionality of DownloadManager
*/
void initTestCase()
{
ApplicationSettingsMock::getInstance()->setIsAutomaticDownloadsEnabled(false);
downloadManager = DownloadManager::getInstance();
}
void test_getVoicesResourceForLocale_data()
{
QTest::addColumn<QString>("locale");
QTest::addColumn<QString>("language");
- QTest::newRow("en_US") << "en_US" << "en";
+ QTest::newRow("en_US") << "en_US" << "en_US";
QTest::newRow("en_UK") << "en_UK" << "en";
QTest::newRow("ru_RU") << "ru_RU" << "ru";
QTest::newRow("de_DE") << "de_DE" << "de";
QTest::newRow("fr_FR") << "fr_FR" << "fr";
}
void test_getVoicesResourceForLocale()
{
QFETCH(QString, locale);
QFETCH(QString, language);
QCOMPARE(downloadManager->getVoicesResourceForLocale(locale),
QString("data2/voices-%1/voices-%2.rcc").arg(COMPRESSED_AUDIO, language));
}
void test_haveLocalResource_data()
{
QTest::addColumn<QString>("resource");
QTest::addColumn<bool>("expected_success");
QTest::newRow("invalid.invalid") << "invalid.invalid" << false;
QTest::newRow("no.no") << "no.no" << false;
QTest::newRow("money.rcc") << "money.rcc" << true;
QTest::newRow("penalty.rcc") << "penalty.rcc" << true;
}
void test_haveLocalResource()
{
QFETCH(QString, resource);
QFETCH(bool, expected_success);
QVERIFY(expected_success == downloadManager->haveLocalResource(resource));
}
void test_downloadResource_data()
{
QTest::addColumn<QString>("resource");
QTest::newRow("invalid.blabla") << "invalid.blabla";
QTest::newRow("algorithm.rcc") << "algorithm.rcc";
}
void test_downloadResource()
{
QFETCH(QString, resource);
QVERIFY(downloadManager->downloadResource(resource));
QVERIFY(!downloadManager->downloadResource(resource));
downloadManager->abortDownloads();
}
void test_updateResource_data()
{
QTest::addColumn<QString>("resource");
QTest::addColumn<bool>("expected_success");
QTest::newRow("invalid.haha") << "invalid.haha" << false;
QTest::newRow("money.rcc") << "money.rcc" << true;
}
void test_updateResource()
{
QFETCH(QString, resource);
QFETCH(bool, expected_success);
QVERIFY(expected_success == downloadManager->updateResource(resource));
}
void test_downloadIsRunning_data()
{
QTest::addColumn<QString>("resource");
QTest::newRow("colors.rcc") << "colors.rcc";
}
void test_downloadIsRunning()
{
QFETCH(QString, resource);
downloadManager->abortDownloads();
QVERIFY(!downloadManager->downloadIsRunning());
QVERIFY(downloadManager->downloadResource(resource));
QVERIFY(downloadManager->downloadIsRunning());
downloadManager->abortDownloads();
}
void test_registerResource_data()
{
QTest::addColumn<QString>("resource");
QTest::addColumn<bool>("expected_success");
QTest::newRow("invalid.rcc") << "invalid.rcc" << false;
QTest::newRow("money.rcc") << "money.rcc" << true;
}
void test_registerResource()
{
QFETCH(QString, resource);
QFETCH(bool, expected_success);
QVERIFY(expected_success == downloadManager->registerResource(resource));
}
void test_isDataRegistered_data()
{
QTest::addColumn<QString>("resource");
QTest::addColumn<QString>("register_mode");
QTest::newRow("invalid.rcc") << "invalid.rcc" << "invalid";
QTest::newRow("mosaic.rcc") << "mosaic.rcc" << "not_registered";
}
void test_isDataRegistered()
{
QFETCH(QString, resource);
QFETCH(QString, register_mode);
if(register_mode == "not_registered") {
QVERIFY(!downloadManager->isDataRegistered(resource));
}
else if(register_mode == "invalid") {
QVERIFY(!downloadManager->registerResource(resource));
QVERIFY(!downloadManager->isDataRegistered(resource));
}
else {
QVERIFY(false);
}
}
private:
/**
* @brief downloadManager The DownloadManager object, that is the test downloadManager
*/
DownloadManager *downloadManager;
};
QTEST_MAIN(DownloadManagerTest);
#include "DownloadManagerTest.moc"
diff --git a/tools/android_build_all_apk.sh b/tools/android_build_all_apk.sh
index fbbb3c227..4c2d8c720 100755
--- a/tools/android_build_all_apk.sh
+++ b/tools/android_build_all_apk.sh
@@ -1,118 +1,114 @@
#!/bin/sh
# Automate the android builds
# This script creates the different apk for arm
#
# Copyright (C) 2016 Bruno Coudoin <bruno.coudoin@gcompris.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
# Uncomment if this is not already done
# make getSvnTranslations
-Qt5_BaseDIR=~/Qt5.12.1/5.12.1
+Qt5_BaseDIR=~/Qt/5.12.5
export ANDROID_NDK_ROOT=$ANDROID_NDK
# The current version
version=$(sed -n -e 's/set(GCOMPRIS_MINOR_VERSION \([0-9]\+\)).*/\1/p' CMakeLists.txt)
# The prefix of the build dir, will be suffixed by the arch target
buildprefix=bb-$version
# Remove po files android do not support
rm -f po/*@*
#
if [ ! -f org.kde.gcompris.appdata.xml ]
then
echo "ERROR: Run me from the top level GCompris source dir"
exit 1
fi
# Param: ANDROID_ARCHITECTURE WITH_ACTIVATION_CODE DEMO_ONLY DOWNLOAD KIOSK_MODE
f_cmake()
{
if [ $# != 5 ]
then
echo "f_cmake missing parameter"
return
fi
if [ -f CMakeCache.txt ]
then
make clean
rm CMakeCache.txt
rm cmake_install.cmake
rm Makefile
rm -rf CMakeFiles
fi
cmake -DCMAKE_TOOLCHAIN_FILE=/usr/share/ECM/toolchain/Android.cmake \
- -DCMAKE_ANDROID_API=16 \
-DCMAKE_BUILD_TYPE=release \
- -DCMAKE_ANDROID_STL_TYPE=c++_shared \
- -DANDROID_TOOLCHAIN_PATH=/opt/android-16-arm/bin/ \
- -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \
-DANDROID_ARCHITECTURE=$1 \
-DQt5_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5 \
-DQt5Qml_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Qml \
-DQt5Network_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Network \
-DQt5Core_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Core \
-DQt5Quick_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Quick \
-DQt5Gui_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Gui \
-DQt5Multimedia_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Multimedia \
-DQt5Svg_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Svg \
-DQt5Widgets_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Widgets \
-DQt5Xml_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Xml \
-DQt5XmlPatterns_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5XmlPatterns \
-DQt5LinguistTools_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5LinguistTools \
-DQt5Sensors_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Sensors \
-DQt5AndroidExtras_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5AndroidExtras \
-Wno-dev \
-DQML_BOX2D_MODULE=submodule \
-DACTIVATION_MODE=$2 \
-DWITH_DEMO_ONLY=$3 \
-DWITH_DOWNLOAD=$4 \
-DWITH_KIOSK_MODE=$5 \
..
}
# ARM
QtTarget=android_armv7
builddir=${buildprefix}-${QtTarget}
mkdir -p ${builddir}
cd ${builddir}
f_cmake arm inapp OFF ON OFF
-make
+make -j 4
make BuildTranslations
make apk_release && make apk_signed && make apk_signed_aligned
f_cmake arm internal OFF ON OFF
-make
+make -j 4
make apk_release && make apk_signed && make apk_signed_aligned
f_cmake arm no OFF ON OFF
-make
+make -j 4
make apk_release && make apk_signed && make apk_signed_aligned
f_cmake arm no ON ON OFF
make clean
-make
+make -j 4
make BuildTranslations
make apk_release && make apk_signed && make apk_signed_aligned
# Remove extra apk
rm -f android/bin/*release-armeabi*
rm -f android/bin/*release-signed-armeabi*
diff --git a/tools/android_build_all_apk.sh b/tools/android_build_all_apk_64.sh
old mode 100755
new mode 100644
similarity index 83%
copy from tools/android_build_all_apk.sh
copy to tools/android_build_all_apk_64.sh
index fbbb3c227..f82ed1557
--- a/tools/android_build_all_apk.sh
+++ b/tools/android_build_all_apk_64.sh
@@ -1,118 +1,110 @@
#!/bin/sh
# Automate the android builds
# This script creates the different apk for arm
#
# Copyright (C) 2016 Bruno Coudoin <bruno.coudoin@gcompris.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <https://www.gnu.org/licenses/>.
# Uncomment if this is not already done
# make getSvnTranslations
-Qt5_BaseDIR=~/Qt5.12.1/5.12.1
+Qt5_BaseDIR=~/Qt/5.12.5
export ANDROID_NDK_ROOT=$ANDROID_NDK
+export ANDROID_ARCH=arm64
+export ANDROID_ARCH_ABI=arm64-v8a
+export Qt5_android=${Qt5_BaseDIR}/${QtTarget}/
# The current version
version=$(sed -n -e 's/set(GCOMPRIS_MINOR_VERSION \([0-9]\+\)).*/\1/p' CMakeLists.txt)
# The prefix of the build dir, will be suffixed by the arch target
buildprefix=bb-$version
# Remove po files android do not support
rm -f po/*@*
#
if [ ! -f org.kde.gcompris.appdata.xml ]
then
echo "ERROR: Run me from the top level GCompris source dir"
exit 1
fi
# Param: ANDROID_ARCHITECTURE WITH_ACTIVATION_CODE DEMO_ONLY DOWNLOAD KIOSK_MODE
f_cmake()
{
if [ $# != 5 ]
then
echo "f_cmake missing parameter"
return
fi
if [ -f CMakeCache.txt ]
then
make clean
rm CMakeCache.txt
rm cmake_install.cmake
rm Makefile
rm -rf CMakeFiles
fi
cmake -DCMAKE_TOOLCHAIN_FILE=/usr/share/ECM/toolchain/Android.cmake \
- -DCMAKE_ANDROID_API=16 \
+ -DCMAKE_ANDROID_API=22 \
-DCMAKE_BUILD_TYPE=release \
- -DCMAKE_ANDROID_STL_TYPE=c++_shared \
- -DANDROID_TOOLCHAIN_PATH=/opt/android-16-arm/bin/ \
- -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang \
-DANDROID_ARCHITECTURE=$1 \
-DQt5_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5 \
-DQt5Qml_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Qml \
-DQt5Network_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Network \
-DQt5Core_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Core \
-DQt5Quick_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Quick \
-DQt5Gui_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Gui \
-DQt5Multimedia_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Multimedia \
-DQt5Svg_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Svg \
-DQt5Widgets_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Widgets \
-DQt5Xml_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Xml \
-DQt5XmlPatterns_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5XmlPatterns \
-DQt5LinguistTools_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5LinguistTools \
-DQt5Sensors_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5Sensors \
-DQt5AndroidExtras_DIR=${Qt5_BaseDIR}/${QtTarget}/lib/cmake/Qt5AndroidExtras \
-Wno-dev \
-DQML_BOX2D_MODULE=submodule \
-DACTIVATION_MODE=$2 \
-DWITH_DEMO_ONLY=$3 \
-DWITH_DOWNLOAD=$4 \
-DWITH_KIOSK_MODE=$5 \
..
}
# ARM
-QtTarget=android_armv7
+QtTarget=android_arm64_v8a
builddir=${buildprefix}-${QtTarget}
mkdir -p ${builddir}
cd ${builddir}
-f_cmake arm inapp OFF ON OFF
-make
+f_cmake arm64 inapp OFF ON OFF
+make -j 4
make BuildTranslations
make apk_release && make apk_signed && make apk_signed_aligned
-f_cmake arm internal OFF ON OFF
-make
-make apk_release && make apk_signed && make apk_signed_aligned
-f_cmake arm no OFF ON OFF
-make
+f_cmake arm64 no OFF ON OFF
+make -j 4
make apk_release && make apk_signed && make apk_signed_aligned
-f_cmake arm no ON ON OFF
-make clean
-make
-make BuildTranslations
-make apk_release && make apk_signed && make apk_signed_aligned
# Remove extra apk
-rm -f android/bin/*release-armeabi*
-rm -f android/bin/*release-signed-armeabi*
+rm -f android/bin/*release-arm64*
+rm -f android/bin/*release-signed-arm64*