Adding complete files
fb07505ecce4
Actions

Authored by nitish on Jan 7 2017, 7:37 PM.

Description

Adding complete files

Details

Committed

nitish

Jan 7 2017, 7:37 PM

Parents

R2:3d0cf6547558: Repeaters problem resolved

Branches

Unknown

Tags

Unknown

nitish committed R2:fb07505ecce4: Adding complete files (authored by nitish).Jan 7 2017, 7:37 PM

Restricted Application added a subscriber: jjazeix. · View Herald TranscriptJan 10 2017, 8:43 PM

Changes (192)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		CMakeLists.txt
A		nitish1.diff
A		nitish2.diff
A		nitish_2.txt
A		nitish_5.txt
M		org.kde.gcompris.appdata.xml
M		org.kde.gcompris.desktop
M		platforms/sailfishOS/harbour-gcompris-qt.desktop
M		src/activities/CMakeLists.txt
M		src/activities/braille_alphabets/Screen.qml
M		src/activities/click_on_letter/click_on_letter.js
A		src/activities/click_on_letter/resource/levels-be.json
M		src/activities/color_mix/ActivityInfo.qml
V		src/activities/color_mix/{color_mix.svg ← colormix.svg}
V		src/activities/color_mix/{colormix.svg → color_mix.svg}
M		src/activities/color_mix_light/ActivityInfo.qml
V		src/activities/color_mix_light/{color_mix_light.svg ← colormixlight.svg}
V		src/activities/color_mix_light/{colormixlight.svg → color_mix_light.svg}
M		src/activities/crane/ActivityInfo.qml
M		src/activities/crane/CMakeLists.txt
M		src/activities/crane/Controls.qml
M		src/activities/crane/Crane.qml
M		src/activities/crane/crane.svg
D		src/activities/crane/resource/README
M		src/activities/crane/resource/arrow_down.svg
M		src/activities/crane/resource/arrow_left.svg
M		src/activities/crane/resource/arrow_right.svg
M		src/activities/crane/resource/arrow_up.svg
P		src/activities/crane/resource/background.svg Copied from src/activities/hangman/resource/background.svg
M		src/activities/crane/resource/bulb.svg
M		src/activities/crane/resource/command.svg
M		src/activities/crane/resource/crane-wire.svg
M		src/activities/crane/resource/crane_only.svg
M		src/activities/crane/resource/crane_up.svg
M		src/activities/crane/resource/crane_vertical.svg
M		src/activities/crane/resource/letter-a.svg
M		src/activities/crane/resource/letter-b.svg
M		src/activities/crane/resource/letters/a.svg
M		src/activities/crane/resource/letters/b.svg
M		src/activities/crane/resource/letters/c.svg
M		src/activities/crane/resource/letters/d.svg
M		src/activities/crane/resource/letters/e.svg
M		src/activities/crane/resource/letters/f.svg
M		src/activities/crane/resource/letters/g.svg
M		src/activities/crane/resource/letters/h.svg
M		src/activities/crane/resource/letters/i.svg
M		src/activities/crane/resource/letters/j.svg
M		src/activities/crane/resource/letters/k.svg
M		src/activities/crane/resource/letters/l.svg
M		src/activities/crane/resource/letters/m.svg
M		src/activities/crane/resource/letters/n.svg
M		src/activities/crane/resource/letters/o.svg
M		src/activities/crane/resource/letters/p.svg
M		src/activities/crane/resource/letters/q.svg
M		src/activities/crane/resource/letters/r.svg
M		src/activities/crane/resource/letters/s.svg
M		src/activities/crane/resource/letters/t.svg
M		src/activities/crane/resource/letters/u.svg
M		src/activities/crane/resource/letters/v.svg
M		src/activities/crane/resource/letters/w.svg
M		src/activities/crane/resource/letters/x.svg
M		src/activities/crane/resource/letters/y.svg
M		src/activities/crane/resource/letters/z.svg
M		src/activities/crane/resource/rectangle1.svg
M		src/activities/crane/resource/rectangle2.svg
D		src/activities/crane/resource/selected.png
A		src/activities/crane/resource/selected.svg
M		src/activities/crane/resource/square1.svg
M		src/activities/crane/resource/square2.svg
M		src/activities/crane/resource/triangle1.svg
M		src/activities/crane/resource/triangle2.svg
M		src/activities/crane/resource/tux.svg
M		src/activities/crane/resource/water_drop1.svg
M		src/activities/crane/resource/water_drop2.svg
M		src/activities/crane/resource/water_spot1.svg
M		src/activities/crane/resource/water_spot2.svg
M		src/activities/drawletters/drawletters.svg
M		src/activities/drawnumbers/drawnumbers.svg
M		src/activities/drawnumbers/drawnumbers_dataset.js
D		src/activities/drawnumbers/resource/bear1.svg
D		src/activities/drawnumbers/resource/bear2.svg
D		src/activities/drawnumbers/resource/carnaval1.svg
D		src/activities/drawnumbers/resource/carnaval2.svg
D		src/activities/drawnumbers/resource/de1.svg
D		src/activities/drawnumbers/resource/de2.svg
D		src/activities/drawnumbers/resource/dn_fond1.svg
D		src/activities/drawnumbers/resource/dn_fond2.svg
D		src/activities/drawnumbers/resource/epouvantail1.svg
D		src/activities/drawnumbers/resource/epouvantail2.svg
D		src/activities/drawnumbers/resource/fish1.svg
D		src/activities/drawnumbers/resource/fish2.svg
D		src/activities/drawnumbers/resource/hibou1.svg
D		src/activities/drawnumbers/resource/hibou2.svg
D		src/activities/drawnumbers/resource/house1.svg
D		src/activities/drawnumbers/resource/house2.svg
D		src/activities/drawnumbers/resource/plane1.svg
D		src/activities/drawnumbers/resource/plane2.svg
D		src/activities/drawnumbers/resource/sapin1.svg
D		src/activities/drawnumbers/resource/sapin2.svg
M		src/activities/explore_monuments/ActivityInfo.qml
M		src/activities/explore_monuments/CMakeLists.txt
D		src/activities/explore_monuments/explore_monuments.png
A		src/activities/explore_monuments/explore_monuments.svg
M		src/activities/explore_world_animals/explore_world_animals.svg
M		src/activities/explore_world_music/explore_world_music.svg
M		src/activities/geo-country/ActivityInfo.qml
M		src/activities/geo-country/GeoCountry.qml
V		src/activities/geo-country/{france_region.svg → geo-country.svg}
V		src/activities/geo-country/{geo-country.svg ← france_region.svg}
A		src/activities/geo-country/resource/board/board16_0.qml
M		src/activities/geo-country/resource/france/auvergne-rhone-alpes.png
M		src/activities/geo-country/resource/france/bourgogne-franche-comte.png
M		src/activities/geo-country/resource/france/bretagne.png
M		src/activities/geo-country/resource/france/centre-val-de-loire.png
M		src/activities/geo-country/resource/france/corse.png
M		src/activities/geo-country/resource/france/france-regions.png
M		src/activities/geo-country/resource/france/grand-est.png
M		src/activities/geo-country/resource/france/haut-de-france.png
M		src/activities/geo-country/resource/france/ile-de-france.png
M		src/activities/geo-country/resource/france/normandie.png
M		src/activities/geo-country/resource/france/nouvelle-aquitaine.png
M		src/activities/geo-country/resource/france/occitanie.png
M		src/activities/geo-country/resource/france/paca.png
M		src/activities/geo-country/resource/france/pays-de-la-loire.png
A	(dir)	src/activities/geo-country/resource/romania/
A		src/activities/geo-country/resource/romania/background.png
A		src/activities/geo-country/resource/romania/banat.png
A		src/activities/geo-country/resource/romania/bucovina.png
A		src/activities/geo-country/resource/romania/crisana.png
A		src/activities/geo-country/resource/romania/dobrogea.png
A		src/activities/geo-country/resource/romania/maramures.png
A		src/activities/geo-country/resource/romania/moldova.png
A		src/activities/geo-country/resource/romania/muntenia.png
A		src/activities/geo-country/resource/romania/oltenia.png
A		src/activities/geo-country/resource/romania/transilvania.png
M		src/activities/geography/ActivityInfo.qml
V		src/activities/geography/{geography.svg ← globe.svg}
V		src/activities/geography/{globe.svg → geography.svg}
M		src/activities/geography/resource/board/board6_0.qml
V		src/activities/geography/resource/europe/{czech.png → czechia.png}
V		src/activities/geography/resource/europe/{czechia.png ← czech.png}
M		src/activities/geography/resource/europe/greece.png
M		src/activities/geography/resource/europe/turkey.png
M		src/activities/graph-coloring/graph-coloring.svg
P		src/activities/hangman/resource/background.svg Copied to src/activities/crane/resource/background.svg
M		src/activities/hanoi_real/HanoiReal.qml
M		src/activities/hanoi_real/hanoi_real.js
A		src/activities/lang/resource/content-be.json
M		src/activities/lang/resource/content-ca.json
M		src/activities/lang/resource/content-pt_BR.json
M		src/activities/letter-in-word/ActivityInfo.qml
M		src/activities/letter-in-word/Card.qml
M		src/activities/letter-in-word/LetterInWord.qml
M		src/activities/letter-in-word/letter-in-word.js
M		src/activities/louis-braille/ActivityInfo.qml
A		src/activities/louis-braille/louis-braille.svg
M		src/activities/mazerelative/ActivityInfo.qml
V		src/activities/mazerelative/{maze.svg → mazerelative.svg}
V		src/activities/mazerelative/{mazerelative.svg ← maze.svg}
M		src/activities/memory-wordnumber/ActivityInfo.qml
V		src/activities/memory-wordnumber/{memory-wordnumber.svg ← memory_wordnumber.svg}
V		src/activities/memory-wordnumber/{memory_wordnumber.svg → memory-wordnumber.svg}
M		src/activities/memory/MemoryCommon.qml
M		src/activities/multiplication_tables/ActivityInfo.qml
M		src/activities/multiplication_tables/Multiplication_tables.qml
M		src/activities/multiplication_tables/Question.qml
M		src/activities/multiplication_tables/multiplication_tables.js
M		src/activities/multiplication_tables/multiplicationtables_dataset.js
A		src/activities/multiplication_tables/resource/children.svg
M		src/activities/nine_men_morris/nine_men_morris.svg
M		src/activities/nine_men_morris_2players/nine_men_morris_2players.svg
M		src/activities/number_sequence/number_sequence.js
M		src/activities/penalty/penalty.js
M		src/activities/readingv/ActivityInfo.qml
V		src/activities/readingv/{reading.svg → readingv.svg}
V		src/activities/readingv/{readingv.svg ← reading.svg}
M		src/activities/redraw_symmetrical/ActivityInfo.qml
V		src/activities/redraw_symmetrical/{redraw_symmetrical.svg ← redraw_symmetry.svg}
V		src/activities/redraw_symmetrical/{redraw_symmetry.svg → redraw_symmetrical.svg}
M		src/activities/scalesboard_weight_avoirdupois/ActivityInfo.qml
V		src/activities/scalesboard_weight_avoirdupois/{scalesboard_weight.svg → scalesboard_weight_avoirdupois.svg}
V		src/activities/scalesboard_weight_avoirdupois/{scalesboard_weight_avoirdupois.svg ← scalesboard_weight.svg}
M		src/activities/share/resource/board/board0.qml
M		src/activities/share/resource/board/board1.qml
M		src/activities/share/resource/board/board2.qml
M		src/activities/share/resource/board/board3.qml
M		src/activities/share/resource/board/board4.qml
M		src/activities/share/resource/board/board5.qml
M		src/activities/share/resource/board/board6.qml
M		src/activities/tic_tac_toe/tic_tac_toe.svg
M		src/activities/tic_tac_toe_2players/tic_tac_toe_2players.svg
M		src/core/main.qml