This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian-debian in repository plm.
commit 316a219302e97c51ec160b4325ca0b0399bd5153 Merge: 9442a46 70ae732 Author: Martin Quinson <[email protected]> Date: Sun Nov 24 16:50:54 2013 +0100 Merge tag 'upstream/2.3+repack' into debian-debian Upstream version 2.3+repack COPYING | 39 +- ChangeLog | 22 + TODO | 1 + build.xml | 4 +- lib/l10n-engine/en.po | 264 +- lib/l10n-engine/fr.po | 265 +- lib/l10n-engine/plm.pot | 256 +- lib/l10n/fr.po | 9352 +++++++++++--------- lib/l10n/plm.pot | 5712 ++++++------ lib/resources/plm.configuration.properties | 6 +- po4a.conf | 128 +- src/lessons/bat/string1/StringMatch.fr.html | 2 +- src/lessons/lightbot/Board01TwoSteps.fr.html | 2 +- src/lessons/recursion/Main.fr.html | 21 +- src/lessons/recursion/Main.html | 16 +- src/lessons/recursion/Main.java | 8 + .../recursion/dragoncurve/DragonCurve1.fr.html | 8 +- .../recursion/dragoncurve/DragonCurve1.html | 4 +- src/lessons/recursion/hanoi/Main.html | 2 +- .../recursion/hanoi/universe/HanoiWorld.fr.html | 5 +- .../recursion/hanoi/universe/HanoiWorld.html | 5 +- .../recursion/hanoi/universe/HanoiWorld.java | 9 +- .../recursion/hanoi/universe/HanoiWorldView.java | 194 +- src/lessons/recursion/koch/Crab.fr.html | 18 + src/lessons/recursion/koch/Crab.html | 12 + src/lessons/recursion/koch/Crab.java | 52 + src/lessons/recursion/koch/CrabEntity.java | 26 + src/lessons/recursion/koch/CrabEntity.py | 18 + src/lessons/recursion/koch/CrabEntity.scala | 27 + src/lessons/recursion/koch/HexaKoch.fr.html | 15 + src/lessons/recursion/koch/HexaKoch.html | 13 + src/lessons/recursion/koch/HexaKoch.java | 44 + src/lessons/recursion/koch/HexaKochEntity.java | 32 + src/lessons/recursion/koch/HexaKochEntity.py | 22 + src/lessons/recursion/koch/HexaKochEntity.scala | 33 + src/lessons/recursion/koch/Koch.fr.html | 21 +- src/lessons/recursion/koch/Koch.html | 17 +- src/lessons/recursion/koch/Koch.java | 12 +- src/lessons/recursion/koch/KochEntity.java | 21 +- src/lessons/recursion/koch/KochEntity.scala | 2 +- src/lessons/recursion/koch/KochHint.png | Bin 0 -> 3381 bytes src/lessons/recursion/koch/PentaKoch.fr.html | 13 + src/lessons/recursion/koch/PentaKoch.html | 9 + src/lessons/recursion/koch/PentaKoch.java | 44 + src/lessons/recursion/koch/PentaKochEntity.java | 50 + src/lessons/recursion/koch/PentaKochEntity.py | 19 + src/lessons/recursion/koch/PentaKochEntity.scala | 33 + src/lessons/recursion/koch/SquareKoch.fr.html | 15 + src/lessons/recursion/koch/SquareKoch.html | 15 + src/lessons/recursion/koch/SquareKoch.java | 44 + src/lessons/recursion/koch/SquareKochEntity.java | 61 + src/lessons/recursion/koch/SquareKochEntity.py | 33 + src/lessons/recursion/koch/SquareKochEntity.scala | 44 + src/lessons/recursion/koch/SquareKochHint.png | Bin 0 -> 1285 bytes src/lessons/sort/dutchflag/DutchFlagAlgo.fr.html | 33 + src/lessons/sort/dutchflag/DutchFlagAlgo.html | 8 +- src/lessons/sort/dutchflag/Main.fr.html | 19 + src/lessons/sort/dutchflag/short_desc.fr.html | 4 + .../sort/dutchflag/universe/DutchFlagWorld.fr.html | 26 + .../sort/dutchflag/universe/DutchFlagWorld.html | 6 +- .../dutchflag/universe/DutchFlagWorldView.java | 140 +- .../sort/pancake/universe/PancakeWorld.java | 4 +- .../pancake/{img => universe}/world_pancake.png | Bin .../pancake/{img => universe}/world_pancake.svg | 0 src/lessons/turtleart/short_desc.html | 3 +- src/lessons/welcome/array/basics/Array1.fr.html | 10 +- src/lessons/welcome/bat/bool1/HasTeen.fr.html | 2 +- src/lessons/welcome/bat/bool1/In1020.fr.html | 2 +- src/lessons/welcome/bat/bool1/In3050.fr.html | 2 +- src/lessons/welcome/bat/bool1/LoneTeen.fr.html | 2 +- src/lessons/welcome/bat/bool1/Max1020.fr.html | 4 +- src/lessons/welcome/bat/bool1/ParotTrouble.fr.html | 2 +- src/lessons/welcome/bat/bool2/AlarmClock.fr.html | 2 +- src/lessons/welcome/bat/bool2/GreenTicket.fr.html | 2 +- src/lessons/welcome/bat/bool2/In1To10.fr.html | 6 +- src/lessons/welcome/bat/bool2/RedTicket.fr.html | 2 +- src/lessons/welcome/bat/bool2/SquirrelPlay.fr.html | 6 +- src/lessons/welcome/bat/bool2/TeenSum.fr.html | 2 +- src/lessons/welcome/loopfor/LoopForEntity.py | 8 +- .../welcome/methods/args/MethodsArgsEntity.py | 2 +- src/plm/core/model/LessonRunner.java | 3 +- src/plm/core/model/session/SourceFile.java | 2 +- src/plm/core/ui/AboutLessonDialog.java | 7 +- src/plm/core/ui/AboutPLMDialog.java | 106 +- src/plm/core/ui/ChooseLectureDialog.java | 4 + src/plm/core/ui/FeedbackDialog.java | 2 +- src/plm/core/ui/MainFrame.java | 90 +- src/plm/core/ui/TipsDialog.java | 6 +- src/plm/core/ui/editor/MissionEditor.java | 2 +- src/plm/universe/EntityControlPanel.java | 2 +- src/plm/universe/bugglequest/BuggleWorld.java | 57 +- src/plm/universe/sort/SortingWorld.java | 14 +- src/plm/universe/turtles/Turtle.java | 17 + src/plm/universe/turtles/TurtleWorld.fr.html | 9 + src/plm/universe/turtles/TurtleWorld.html | 9 + src/plm/universe/turtles/TurtleWorld.java | 36 +- src/plm/universe/turtles/TurtleWorldView.java | 10 +- 97 files changed, 10195 insertions(+), 7568 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
