Merge branch 'dev' of github.com:colobot/colobot-data into dev

Conflicts: CHANGELOG.txt
2013-01-01 13:09:04 +01:00 · 2013-01-01 13:09:04 +01:00 · ff81eabb01
parent 816f15a3e0 c1f1264b44
commit ff81eabb01
4 changed files with 1 additions and 0 deletions
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@ -6,6 +6,7 @@ Fix URL of colobot repository.
 Render README for Markdown.
 Ease git-based releasing.
 Handle levels iternationalisation with po4a.
+Drop translations as they are built from colobot itself.

 ----------------
 2012-10-05
--- a/i18n/de/LC_MESSAGES/colobot.mo
+++ b/i18n/de/LC_MESSAGES/colobot.mo
--- a/i18n/fr/LC_MESSAGES/colobot.mo
+++ b/i18n/fr/LC_MESSAGES/colobot.mo
--- a/i18n/pl/LC_MESSAGES/colobot.mo
+++ b/i18n/pl/LC_MESSAGES/colobot.mo