Merge pull request from OdyX/dev-OdyX-201301

Makes dev build again in Travis + manpage fix
dev-ui
Piotr Dziwiński 2013-01-20 06:25:12 -08:00
commit f03af31cec
4 changed files with 7 additions and 7 deletions

View File

@ -7,6 +7,6 @@ before_install:
- git submodule update --init --recursive
- sudo add-apt-repository ppa:mapnik/boost -y
- sudo apt-get update -qq
- sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin
- sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libglew-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin libsndfile-dev
notifications:
email: false

View File

@ -1,6 +1,6 @@
=encoding utf8
=head1 COLOBOT
=head1 NAME
colobot - educational programming strategy game

View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-12-27 10:59+0100\n"
"POT-Creation-Date: 2013-01-20 14:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -33,7 +33,7 @@ msgstr ""
#. type: =head1
#: colobot.pod:3
msgid "COLOBOT"
msgid "NAME"
msgstr ""
#. type: textblock

View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2012-12-27 10:55+0100\n"
"POT-Creation-Date: 2013-01-20 14:26+0100\n"
"PO-Revision-Date: 2012-12-27 11:00+0100\n"
"Last-Translator: Didier Raboud <odyx@debian.org>\n"
"Language-Team: none\n"
@ -33,8 +33,8 @@ msgstr "Colonise avec des roBots"
#. type: =head1
#: colobot.pod:3
msgid "COLOBOT"
msgstr "COLOBOT"
msgid "NAME"
msgstr "NOM"
#. type: textblock
#: colobot.pod:5