Commit Graph

731 Commits

Author SHA1 Message Date
Perttu Ahola
fdf14471c6 Merge branch 'master' of git://github.com/erlehmann/minetest-delta 2011-07-22 22:59:15 +03:00
Nils Dagsson Moskopp
7da02e05a6 * README updated 2011-07-22 21:56:00 +02:00
Perttu Ahola
6c2d95f868 * key change menu now saving immediately 2011-07-22 21:54:26 +02:00
Perttu Ahola
58f612eca1 Changing key settings now doesn't require a game restart 2011-07-22 22:35:20 +03:00
Nils Dagsson Moskopp
2452ce67f4 Merge pull request #33 from SpeedProg/master
gettext fix of laguagefile names
2011-07-22 12:10:19 -07:00
Constantin Wenger
84c370b1db change in readme of a lib 2011-07-22 20:55:00 +02:00
Constantin Wenger
2abe6ed75c Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger
a12229f271 fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Constantin Wenger
b278988924 updated some parts which don't really make a problem but are better this way 2011-07-22 20:40:46 +02:00
Nils Dagsson Moskopp
805ccd449f Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Nils Dagsson Moskopp
0fbb0bcaab Merge pull request #32 from Oblomov/master
Gettext + misc fixes
2011-07-22 10:30:55 -07:00
Perttu Ahola
f706644a50 Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly. 2011-07-22 18:51:49 +03:00
Giuseppe Bilotta
9653522873 Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Constantin Wenger
bf3dfec7d6 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Giuseppe Bilotta
aaa165f985 updatepo cmake rule
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
2011-07-22 12:40:29 +02:00
Perttu Ahola
2b39be44e4 added an unit test for the Settings thingy (the python ConfigParser -like thing) 2011-07-22 13:10:58 +03:00
Giuseppe Bilotta
8f2409a1b4 Static naming of po file
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
2011-07-22 09:58:02 +02:00
Giuseppe Bilotta
0ec749317c Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta
bc05bd8b59 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta
7c1ea34baf Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
2011-07-22 07:48:22 +02:00
Constantin Wenger
3d53cc2c11 changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Perttu Ahola
329158f7d1 Fixed small error in mapnode.cpp (didn't cause any harm though) 2011-07-22 01:37:21 +03:00
Perttu Ahola
fe855e004f Fixed new map generator causing a crash when generating at map limit 2011-07-22 01:37:05 +03:00
Perttu Ahola
2b3bc33708 added some TODOs to main.cpp 2011-07-21 23:28:30 +03:00
Nils Dagsson Moskopp
909075da5c * nicer firefly texture 2011-07-21 20:13:31 +02:00
Perttu Ahola
308d861327 Merged minetest-delta a624fe549bc75855a170 2011-07-21 20:55:08 +03:00
Nils Dagsson Moskopp
9c557c3846 + unknown block is sick 2011-07-21 17:36:23 +02:00
Nils Dagsson Moskopp
6505bae414 Merge pull request #29 from cisoun/master
Add french translation.
2011-07-21 07:33:34 -07:00
Constantin Wenger
4e5aac5f26 fixed not finding dll for gettext in MSVC 2011-07-21 16:21:01 +02:00
Cyriaque Skrapits
9303283d6e Added missing .po fil.e 2011-07-21 16:14:18 +02:00
Cyriaque Skrapits
8048961cc5 Added french translation. 2011-07-21 16:09:57 +02:00
Perttu Ahola
52ad5944c0 Attempt to fix the big bug. Now server either stops sending map or mapgen starts generating CONTENT_IGNORE. 2011-07-21 17:00:08 +03:00
Nils Dagsson Moskopp
cbf2ac5e8f * different collision box for fireflies so they now hover above the ground 2011-07-21 15:40:00 +02:00
Giuseppe Bilotta
767280577b Reorganize cmake gettext message output to ease debugging 2011-07-21 15:16:59 +02:00
Giuseppe Bilotta
aa6506ce96 Restore "Leave address blank" position 2011-07-21 15:12:58 +02:00
Giuseppe Bilotta
02695bebc6 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Giuseppe Bilotta
7b93fb59cf Only install locale files if using gettext 2011-07-21 14:46:23 +02:00
Giuseppe Bilotta
adb7181969 Uppercase DEFINED or cmake 2.8.4 complains 2011-07-21 13:59:50 +02:00
Constantin Wenger
ad2f95fc70 updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses
2011-07-21 13:24:37 +02:00
Giuseppe Bilotta
b99174cb0c Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta
fd70bbd367 Make gettext optional 2011-07-21 09:03:41 +02:00
Weedy
36d8f91f1a Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Weedy
9cb5f70be5 Fix win32 MSVC compile. (screw gettext) 2011-07-21 09:03:17 +02:00
Nils Dagsson Moskopp
bca3de3d08 Merge pull request #27 from Oblomov/master
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Giuseppe Bilotta
29aae3dcb5 Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
2011-07-20 23:09:28 +02:00
Nils Dagsson Moskopp
8129d16dd3 + fireflies 2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
4cbdf136fc * README updated 2011-07-20 19:14:40 +02:00
Nils Dagsson Moskopp
2732dac337 Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
0f10fc0cd9 Merge pull request #24 from SpeedProg/master
gettext paths problem
2011-07-20 09:56:23 -07:00
Constantin Wenger
c6d99fbe0c fixed problem with wront paths in gettext 2011-07-20 18:49:18 +02:00