This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch debian-debian in repository plm.
commit 281f9be526fc9ac4a0dd7f82ce29c2c7104f0ecc Merge: fdce16a f0a283a Author: Martin Quinson <[email protected]> Date: Sun Sep 8 22:56:42 2013 +0200 Merge tag 'upstream/2.2.1+repack' into debian-debian Upstream version 2.2.1+repack ChangeLog | 16 + build.xml | 10 +- img/logo.png | Bin 71746 -> 36431 bytes lib/l10n-engine/en.po | 364 ++++++++++---------- lib/l10n-engine/fr.po | 359 +++++++++---------- lib/l10n-engine/plm.pot | 343 +++++++++--------- lib/l10n/fr.po | 172 +++++---- lib/l10n/plm.pot | 86 +++-- lib/resources/plm.configuration.properties | 6 +- src/lessons/sort/selection/AlgSelectionSort.java | 2 +- .../turmites/helloturmite/HelloTurmite.fr.html | 2 +- .../turmites/helloturmite/HelloTurmite.html | 2 +- src/lessons/welcome/array/basics/Array2.fr.html | 4 +- src/lessons/welcome/bdr/BDR.fr.html | 20 +- src/lessons/welcome/bdr/BDR.html | 18 +- src/lessons/welcome/bdr/BDR2.fr.html | 34 +- src/lessons/welcome/bdr/BDR2.html | 34 +- .../welcome/environment/Environment.fr.html | 7 +- src/lessons/welcome/environment/Environment.html | 2 +- .../welcome/instructions/Instructions.fr.html | 4 +- src/lessons/welcome/loopdowhile/Poucet.fr.html | 6 +- src/lessons/welcome/loopdowhile/Poucet.html | 5 +- src/lessons/welcome/loopfor/LoopFor.java | 2 +- src/lessons/welcome/loopfor/LoopStairs.fr.html | 7 +- src/lessons/welcome/loopfor/LoopStairs.html | 5 +- src/lessons/welcome/loopwhile/BaggleSeeker.java | 2 +- .../welcome/methods/args/MethodsArgs.fr.html | 9 +- src/lessons/welcome/methods/basics/Methods.java | 2 +- .../welcome/methods/flowerpot/FlowerPotEntity.py | 32 +- .../methods/picture/PictureMono2Entity.java | 17 +- .../methods/picture/PictureMono2Entity.scala | 17 +- .../methods/picture/PictureMono3Entity.java | 17 +- .../methods/picture/PictureMono3Entity.scala | 17 +- .../welcome/methods/picture/PictureMonoEntity.java | 21 +- .../methods/picture/PictureMonoEntity.scala | 17 +- .../methods/returning/MethodsReturning.java | 6 +- src/lessons/welcome/methods/slug/SlugHunting.java | 4 +- src/lessons/welcome/methods/slug/SlugSnail.java | 4 +- .../welcome/methods/slug/SlugTracking.fr.html | 5 +- src/lessons/welcome/methods/slug/SlugTracking.html | 5 +- src/lessons/welcome/methods/slug/SlugTracking.java | 4 +- .../welcome/methods/slug/SlugTrackingEntity.java | 5 - .../welcome/methods/slug/SlugTrackingEntity.scala | 4 - src/lessons/welcome/variables/Variables.java | 2 +- src/plm/core/model/Game.java | 10 +- src/plm/core/model/LessonRunner.java | 93 ++--- src/plm/core/model/lesson/Exercise.java | 2 +- .../model/lesson/ExerciseTemplatingEntity.java | 7 +- src/plm/core/ui/ExerciseView.java | 36 +- src/plm/core/ui/MainFrame.java | 14 +- src/plm/core/ui/WorldView.java | 10 - .../ui/editor/buggleeditor}/EditionListener.java | 2 +- .../ui/editor/buggleeditor}/Editor.java | 2 +- .../ui/editor/buggleeditor}/MainFrame.java | 2 +- .../ui/editor/buggleeditor}/MapEditorApp.java | 2 +- .../ui/editor/buggleeditor}/MapView.java | 6 +- .../ui/editor/buggleeditor}/PropertiesEditor.java | 7 +- src/plm/universe/Entity.java | 1 - src/plm/universe/bugglequest/AbstractBuggle.java | 11 +- src/plm/universe/bugglequest/Baggle.java | 69 ---- src/plm/universe/bugglequest/BuggleWorld.java | 11 +- src/plm/universe/bugglequest/BuggleWorldCell.java | 71 ++-- .../bugglequest/mapeditor/package-info.java | 5 - .../universe/bugglequest/ui/BuggleWorldView.java | 9 +- src/plm/universe/sort/SortingWorld.java | 24 +- 65 files changed, 1046 insertions(+), 1048 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
