Merge remote-tracking branch 'erlehmann/master'

Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt

6 files changed, 140 insertions, 1 deletions

diff --git a/data/firefly.png b/data/firefly.png
index d5a444b03..40df7fa1c 100644
--- a/data/firefly.png
+++ b/data/firefly.png
diff --git a/data/unknown_block.png b/data/unknown_block.png
index a27cb8ca9..8a8e0109c 100644
--- a/data/unknown_block.png
+++ b/data/unknown_block.png
diff --git a/po/fr/minetest-c55.po b/po/fr/minetest-c55.po
new file mode 100644
index 000000000..cfb76ae1a
--- /dev/null
+++ b/po/fr/minetest-c55.po
@@ -0,0 +1,125 @@
+# French translations for minetest-c55 package.
+# Copyright (C) 2011 celeron
+# This file is distributed under the same license as the minetest-c55 package.
+# Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>, 2011
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-21 02:00+0200\n"
+"PO-Revision-Date: 2011-07-21 15:48+0200\n"
+"Last-Translator: Cyriaque 'Cisoun' Skrapits <cysoun@gmail.com>\n"
+"Language-Team: Français <>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: src/guiMainMenu.cpp:180
+msgid "Name/Password"
+msgstr "Nom / MdP"
+
+#: src/guiMainMenu.cpp:202
+msgid "Address/Port"
+msgstr "Adresse / Port"
+
+#: src/guiMainMenu.cpp:220
+msgid "Leave address blank to start a local server."
+msgstr "Laisser l'adresse vide pour lancer un serveur local."
+
+#: src/guiMainMenu.cpp:226
+msgid "Fancy trees"
+msgstr "Arbres spéciaux"
+
+#: src/guiMainMenu.cpp:232
+msgid "Smooth Lighting"
+msgstr "Lumière douce"
+
+#: src/guiMainMenu.cpp:239
+msgid "Start Game / Connect"
+msgstr "Démarrer / Connecter"
+
+#: src/guiMainMenu.cpp:247
+msgid "Change keys"
+msgstr "Changer touches"
+
+#: src/guiMainMenu.cpp:269
+msgid "Creative Mode"
+msgstr "Mode créatif"
+
+#: src/guiMainMenu.cpp:274
+msgid "Enable Damage"
+msgstr "Activer blessures"
+
+#: src/guiMainMenu.cpp:281
+msgid "Delete map"
+msgstr "Supprimer carte"
+
+#: src/guiMessageMenu.cpp:92
+#: src/guiTextInputMenu.cpp:110
+msgid "Proceed"
+msgstr "OK"
+
+#: src/guiPasswordChange.cpp:102
+msgid "Old Password"
+msgstr "Ancien mot de passe"
+
+#: src/guiPasswordChange.cpp:116
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: src/guiPasswordChange.cpp:129
+msgid "Confirm Password"
+msgstr "Confirmer mot de passe"
+
+#: src/guiPasswordChange.cpp:143
+msgid "Change"
+msgstr "Changer"
+
+#: src/guiPasswordChange.cpp:151
+msgid "Passwords do not match!"
+msgstr "Mauvaise correspondance!"
+
+#: src/guiPauseMenu.cpp:109
+msgid "Continue"
+msgstr "Continuer"
+
+#: src/guiPauseMenu.cpp:115
+msgid "Change Password"
+msgstr "Changer mot de passe"
+
+#: src/guiPauseMenu.cpp:121
+msgid "Disconnect"
+msgstr "Déconnection"
+
+#: src/guiPauseMenu.cpp:127
+msgid "Exit to OS"
+msgstr "Quitter le jeu"
+
+#: src/guiPauseMenu.cpp:134
+msgid ""
+"Keys:\n"
+"- WASD: Walk\n"
+"- Mouse left: dig blocks\n"
+"- Mouse right: place blocks\n"
+"- Mouse wheel: select item\n"
+"- 0...9: select item\n"
+"- Shift: sneak\n"
+"- R: Toggle viewing all loaded chunks\n"
+"- I: Inventory menu\n"
+"- ESC: This menu\n"
+"- T: Chat\n"
+msgstr ""
+"Touches:\n"
+"- WASD: Marcher\n"
+"- Clic gauche: Creuser bloc\n"
+"- Clic droite: Insérer bloc\n"
+"- Roulette: Sélection élément\n"
+"- 0...9: Sélection élément\n"
+"- Shift: S'accroupir\n"
+"- R: Active la vue de tous les blocs\n"
+"- I: Inventaire\n"
+"- T: Chat\n"
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c6e1d450..f3dee7f30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -268,6 +268,7 @@ if(BUILD_CLIENT)
 
 	if (USE_GETTEXT)
 		install(FILES ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo DESTINATION locale/de/LC_MESSAGES)
+		install(FILES ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo DESTINATION locale/fr/LC_MESSAGES)
 	endif()
 
 	if(WIN32)
@@ -294,6 +295,7 @@ endif(BUILD_SERVER)
 
 if (USE_GETTEXT)
 	add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMENT "mo-update [de]: Creating locale directory.")
+	add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES COMMENT "mo-update [fr]: Creating locale directory.")
 
 	add_custom_command(
 			OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo
@@ -304,7 +306,18 @@ if (USE_GETTEXT)
 			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/de
 			COMMENT "mo-update [de]: Creating mo file."
 			)
+	add_custom_command(
+			OUTPUT ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo
+			COMMAND ${GETTEXT_MSGFMT} -o ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo ${CMAKE_SOURCE_DIR}/po/fr/minetest-c55.po 
+			DEPENDS 
+				${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES
+				${CMAKE_SOURCE_DIR}/po/fr/minetest-c55.po
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/fr
+			COMMENT "mo-update [fr]: Creating mo file."
+			)
+
 	add_custom_target(translation_de ALL COMMENT "mo update [de]" DEPENDS ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-delta.mo)
+	add_custom_target(translation_fr ALL COMMENT "mo update [fr]" DEPENDS ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo)
 endif(USE_GETTEXT)
 
 # Subdirectories
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index aeeafc2f8..0b81855c1 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -809,7 +809,7 @@ void FireflySAO::step(float dtime, bool send_recommended)
 		Move it, with collision detection
 	*/
 
-	core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.);
+	core::aabbox3d<f32> box(-BS/3.,-BS*2/3.0,-BS/3., BS/3.,BS*4./3.,BS/3.);
 	collisionMoveResult moveresult;
 	// Maximum movement without glitches
 	f32 pos_max_d = BS*0.25;
diff --git a/updatelocales.sh b/updatelocales.sh
index 1ac42342d..e84145107 100755
--- a/updatelocales.sh
+++ b/updatelocales.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
 xgettext -n -o minetest-c55.pot ./src/*.cpp ./src/*.h
 msgmerge -U ./po/de/minetest-c55.po minetest-c55.pot
+msgmerge -U ./po/fr/minetest-c55.po minetest-c55.pot
 rm minetest-c55.pot